home *** CD-ROM | disk | FTP | other *** search
| Emacs Compiled Lisp | 1998-05-21 | 22.8 KB |
open in: 
MacOS 8.1
|
Win98
|
DOS
view JSON data
|
view as text
This file was processed as: Emacs Compiled Lisp
(other/emacsCompiledLisp).
This format is not currently supported by dexvert.
| Confidence | Program | Detection | Match Type | Support
|
|---|
| 1%
| dexvert
| Emacs Compiled Lisp (other/emacsCompiledLisp)
| magic
| Unsupported |
| 100%
| file
| Emacs/XEmacs v20 byte-compiled Lisp data
| default
| |
| 99%
| file
| data
| default
| |
| 100%
| TrID
| Emacs/XEmacs byte-compiled Lisp (generic)
| default
|
|
hex view+--------+-------------------------+-------------------------+--------+--------+
|00000000| 3b 45 4c 43 14 00 00 00 | 0a 3b 3b 3b 20 63 6f 6d |;ELC....|.;;; com|
|00000010| 70 69 6c 65 64 20 62 79 | 20 6a 75 73 74 69 6e 62 |piled by| justinb|
|00000020| 40 65 62 6f 6e 79 2e 63 | 72 61 79 2e 63 6f 6d 20 |@ebony.c|ray.com |
|00000030| 6f 6e 20 4d 6f 6e 20 4d | 61 72 20 20 39 20 31 32 |on Mon M|ar 9 12|
|00000040| 3a 34 38 3a 30 38 20 31 | 39 39 38 0a 3b 3b 3b 20 |:48:08 1|998.;;; |
|00000050| 66 72 6f 6d 20 66 69 6c | 65 20 2f 68 6f 6d 65 2f |from fil|e /home/|
|00000060| 61 73 70 65 6e 30 37 2f | 6a 75 73 74 69 6e 62 2f |aspen07/|justinb/|
|00000070| 72 6f 6f 74 73 2f 66 72 | 65 65 77 61 72 65 2f 78 |roots/fr|eeware/x|
|00000080| 65 6d 61 63 73 2f 32 30 | 2e 33 2f 78 65 6d 61 63 |emacs/20|.3/xemac|
|00000090| 73 2d 32 30 2e 33 2f 6c | 69 73 70 2f 65 64 69 66 |s-20.3/l|isp/edif|
|000000a0| 66 2f 65 64 69 66 66 2d | 64 69 66 66 2e 65 6c 0a |f/ediff-|diff.el.|
|000000b0| 3b 3b 3b 20 65 6d 61 63 | 73 20 76 65 72 73 69 6f |;;; emac|s versio|
|000000c0| 6e 20 32 30 2e 34 20 22 | 45 6d 65 72 61 6c 64 22 |n 20.4 "|Emerald"|
|000000d0| 20 58 45 6d 61 63 73 20 | 20 4c 75 63 69 64 2e 0a | XEmacs | Lucid..|
|000000e0| 3b 3b 3b 20 62 79 74 65 | 63 6f 6d 70 20 76 65 72 |;;; byte|comp ver|
|000000f0| 73 69 6f 6e 20 32 2e 32 | 35 20 58 45 6d 61 63 73 |sion 2.2|5 XEmacs|
|00000100| 3b 20 32 32 2d 4d 61 72 | 2d 39 36 2e 0a 3b 3b 3b |; 22-Mar|-96..;;;|
|00000110| 20 6f 70 74 69 6d 69 7a | 61 74 69 6f 6e 20 69 73 | optimiz|ation is|
|00000120| 20 6f 6e 2e 0a 3b 3b 3b | 20 74 68 69 73 20 66 69 | on..;;;| this fi|
|00000130| 6c 65 20 75 73 65 73 20 | 6f 70 63 6f 64 65 73 20 |le uses |opcodes |
|00000140| 77 68 69 63 68 20 64 6f | 20 6e 6f 74 20 65 78 69 |which do| not exi|
|00000150| 73 74 20 69 6e 20 45 6d | 61 63 73 20 31 39 2e 0a |st in Em|acs 19..|
|00000160| 0a 28 69 66 20 28 61 6e | 64 20 28 62 6f 75 6e 64 |.(if (an|d (bound|
|00000170| 70 20 27 65 6d 61 63 73 | 2d 76 65 72 73 69 6f 6e |p 'emacs|-version|
|00000180| 29 0a 09 20 28 6f 72 20 | 28 61 6e 64 20 28 62 6f |).. (or |(and (bo|
|00000190| 75 6e 64 70 20 27 65 70 | 6f 63 68 3a 3a 76 65 72 |undp 'ep|och::ver|
|000001a0| 73 69 6f 6e 29 20 65 70 | 6f 63 68 3a 3a 76 65 72 |sion) ep|och::ver|
|000001b0| 73 69 6f 6e 29 0a 09 20 | 20 20 20 20 28 73 74 72 |sion).. | (str|
|000001c0| 69 6e 67 2d 6c 65 73 73 | 70 20 65 6d 61 63 73 2d |ing-less|p emacs-|
|000001d0| 76 65 72 73 69 6f 6e 20 | 22 32 30 22 29 29 29 0a |version |"20"))).|
|000001e0| 20 20 20 20 28 65 72 72 | 6f 72 20 22 60 65 64 69 | (err|or "`edi|
|000001f0| 66 66 2d 64 69 66 66 2e | 65 6c 27 20 77 61 73 20 |ff-diff.|el' was |
|00000200| 63 6f 6d 70 69 6c 65 64 | 20 66 6f 72 20 45 6d 61 |compiled| for Ema|
|00000210| 63 73 20 32 30 22 29 29 | 0a 0a 28 6f 72 20 28 62 |cs 20"))|..(or (b|
|00000220| 6f 75 6e 64 70 20 27 63 | 75 72 72 65 6e 74 2d 6c |oundp 'c|urrent-l|
|00000230| 6f 61 64 2d 6c 69 73 74 | 29 20 28 73 65 74 71 20 |oad-list|) (setq |
|00000240| 63 75 72 72 65 6e 74 2d | 6c 6f 61 64 2d 6c 69 73 |current-|load-lis|
|00000250| 74 20 6e 69 6c 29 29 0a | 0a 0a 28 62 79 74 65 2d |t nil)).|..(byte-|
|00000260| 63 6f 64 65 20 22 c0 c1 | 21 88 c2 0b 42 13 c4 c5 |code "..|!...B...|
|00000270| 21 88 c6 c1 c7 c8 c9 ca | cb cc 26 07 87 22 20 5b |!.......|..&.." [|
|00000280| 70 72 6f 76 69 64 65 20 | 65 64 69 66 66 2d 64 69 |provide |ediff-di|
|00000290| 66 66 20 65 64 69 66 66 | 2d 64 65 66 61 75 6c 74 |ff ediff|-default|
|000002a0| 2d 76 61 72 69 61 6e 74 | 20 63 75 72 72 65 6e 74 |-variant| current|
|000002b0| 2d 6c 6f 61 64 2d 6c 69 | 73 74 20 72 65 71 75 69 |-load-li|st requi|
|000002c0| 72 65 20 65 64 69 66 66 | 2d 69 6e 69 74 20 63 75 |re ediff|-init cu|
|000002d0| 73 74 6f 6d 2d 64 65 63 | 6c 61 72 65 2d 67 72 6f |stom-dec|lare-gro|
|000002e0| 75 70 20 6e 69 6c 20 22 | 44 69 66 66 20 72 65 6c |up nil "|Diff rel|
|000002f0| 61 74 65 64 20 75 74 69 | 6c 69 74 69 65 73 22 20 |ated uti|lities" |
|00000300| 3a 70 72 65 66 69 78 20 | 22 65 64 69 66 66 2d 22 |:prefix |"ediff-"|
|00000310| 20 3a 67 72 6f 75 70 20 | 65 64 69 66 66 5d 20 38 | :group |ediff] 8|
|00000320| 29 0a 28 63 75 73 74 6f | 6d 2d 64 65 63 6c 61 72 |).(custo|m-declar|
|00000330| 65 2d 76 61 72 69 61 62 | 6c 65 20 27 65 64 69 66 |e-variab|le 'edif|
|00000340| 66 2d 73 68 65 6c 6c 20 | 27 28 63 6f 6e 64 20 28 |f-shell |'(cond (|
|00000350| 28 65 71 20 73 79 73 74 | 65 6d 2d 74 79 70 65 20 |(eq syst|em-type |
|00000360| 27 65 6d 78 29 20 22 63 | 6d 64 22 29 20 28 28 6d |'emx) "c|md") ((m|
|00000370| 65 6d 71 20 73 79 73 74 | 65 6d 2d 74 79 70 65 20 |emq syst|em-type |
|00000380| 27 28 6d 73 2d 64 6f 73 | 20 77 69 6e 64 6f 77 73 |'(ms-dos| windows|
|00000390| 2d 6e 74 20 77 69 6e 64 | 6f 77 73 2d 39 35 29 29 |-nt wind|ows-95))|
|000003a0| 20 73 68 65 6c 6c 2d 66 | 69 6c 65 2d 6e 61 6d 65 | shell-f|ile-name|
|000003b0| 29 20 28 28 6d 65 6d 71 | 20 73 79 73 74 65 6d 2d |) ((memq| system-|
|000003c0| 74 79 70 65 20 27 28 76 | 61 78 2d 76 6d 73 20 61 |type '(v|ax-vms a|
|000003d0| 78 70 2d 76 6d 73 29 29 | 20 22 2a 64 63 6c 2a 22 |xp-vms))| "*dcl*"|
|000003e0| 29 20 28 74 20 22 73 68 | 22 29 29 20 22 2a 54 68 |) (t "sh|")) "*Th|
|000003f0| 65 20 73 68 65 6c 6c 20 | 75 73 65 64 20 74 6f 20 |e shell |used to |
|00000400| 72 75 6e 20 64 69 66 66 | 20 61 6e 64 20 70 61 74 |run diff| and pat|
|00000410| 63 68 2e 20 20 49 66 20 | 75 73 65 72 27 73 20 2e |ch. If |user's .|
|00000420| 70 72 6f 66 69 6c 65 20 | 6f 72 5c 6e 2e 63 73 68 |profile |or\n.csh|
|00000430| 72 63 20 66 69 6c 65 73 | 20 61 72 65 20 73 65 74 |rc files| are set|
|00000440| 20 75 70 20 63 6f 72 72 | 65 63 74 6c 79 2c 20 61 | up corr|ectly, a|
|00000450| 6e 79 20 73 68 65 6c 6c | 20 77 69 6c 6c 20 64 6f |ny shell| will do|
|00000460| 2e 20 20 48 6f 77 65 76 | 65 72 2c 20 73 6f 6d 65 |. Howev|er, some|
|00000470| 20 70 65 6f 70 6c 65 5c | 6e 73 65 74 20 24 70 72 | people\|nset $pr|
|00000480| 6f 6d 70 74 20 6f 72 20 | 6f 74 68 65 72 20 74 68 |ompt or |other th|
|00000490| 69 6e 67 73 20 69 6e 63 | 6f 72 72 65 63 74 6c 79 |ings inc|orrectly|
|000004a0| 2c 20 77 68 69 63 68 20 | 6c 65 61 64 73 20 74 6f |, which |leads to|
|000004b0| 20 75 6e 64 65 73 69 72 | 61 62 6c 65 20 6f 75 74 | undesir|able out|
|000004c0| 70 75 74 5c 6e 6d 65 73 | 73 61 67 65 73 2e 20 20 |put\nmes|sages. |
|000004d0| 54 68 65 73 65 20 6d 61 | 79 20 63 61 75 73 65 20 |These ma|y cause |
|000004e0| 45 64 69 66 66 20 74 6f | 20 66 61 69 6c 2e 20 20 |Ediff to| fail. |
|000004f0| 49 6e 20 73 75 63 68 20 | 61 20 63 61 73 65 2c 20 |In such |a case, |
|00000500| 73 65 74 20 65 64 69 66 | 66 2d 73 68 65 6c 6c 5c |set edif|f-shell\|
|00000510| 6e 74 6f 20 61 20 73 68 | 65 6c 6c 20 74 68 61 74 |nto a sh|ell that|
|00000520| 20 79 6f 75 20 61 72 65 | 20 6e 6f 74 20 75 73 69 | you are| not usi|
|00000530| 6e 67 20 6f 72 2c 20 62 | 65 74 74 65 72 2c 20 66 |ng or, b|etter, f|
|00000540| 69 78 20 79 6f 75 72 20 | 73 68 65 6c 6c 27 73 20 |ix your |shell's |
|00000550| 73 74 61 72 74 75 70 20 | 66 69 6c 65 2e 22 20 3a |startup |file." :|
|00000560| 74 79 70 65 20 27 73 74 | 72 69 6e 67 20 3a 67 72 |type 'st|ring :gr|
|00000570| 6f 75 70 20 27 65 64 69 | 66 66 2d 64 69 66 66 29 |oup 'edi|ff-diff)|
|00000580| 0a 28 63 75 73 74 6f 6d | 2d 64 65 63 6c 61 72 65 |.(custom|-declare|
|00000590| 2d 76 61 72 69 61 62 6c | 65 20 27 65 64 69 66 66 |-variabl|e 'ediff|
|000005a0| 2d 63 6d 70 2d 70 72 6f | 67 72 61 6d 20 27 22 63 |-cmp-pro|gram '"c|
|000005b0| 6d 70 22 20 22 2a 55 74 | 69 6c 69 74 79 20 74 6f |mp" "*Ut|ility to|
|000005c0| 20 75 73 65 20 74 6f 20 | 64 65 74 65 72 6d 69 6e | use to |determin|
|000005d0| 65 20 69 66 20 74 77 6f | 20 66 69 6c 65 73 20 61 |e if two| files a|
|000005e0| 72 65 20 69 64 65 6e 74 | 69 63 61 6c 2e 5c 6e 49 |re ident|ical.\nI|
|000005f0| 74 20 6d 75 73 74 20 72 | 65 74 75 72 6e 20 63 6f |t must r|eturn co|
|00000600| 64 65 20 30 2c 20 69 66 | 20 69 74 73 20 61 72 67 |de 0, if| its arg|
|00000610| 75 6d 65 6e 74 73 20 61 | 72 65 20 69 64 65 6e 74 |uments a|re ident|
|00000620| 69 63 61 6c 20 66 69 6c | 65 73 2e 22 20 3a 74 79 |ical fil|es." :ty|
|00000630| 70 65 20 27 73 74 72 69 | 6e 67 20 3a 67 72 6f 75 |pe 'stri|ng :grou|
|00000640| 70 20 27 65 64 69 66 66 | 2d 64 69 66 66 29 0a 28 |p 'ediff|-diff).(|
|00000650| 63 75 73 74 6f 6d 2d 64 | 65 63 6c 61 72 65 2d 76 |custom-d|eclare-v|
|00000660| 61 72 69 61 62 6c 65 20 | 27 65 64 69 66 66 2d 64 |ariable |'ediff-d|
|00000670| 69 66 66 2d 70 72 6f 67 | 72 61 6d 20 27 22 64 69 |iff-prog|ram '"di|
|00000680| 66 66 22 20 22 2a 50 72 | 6f 67 72 61 6d 20 74 6f |ff" "*Pr|ogram to|
|00000690| 20 75 73 65 20 66 6f 72 | 20 67 65 6e 65 72 61 74 | use for| generat|
|000006a0| 69 6e 67 20 74 68 65 20 | 64 69 66 66 65 72 65 6e |ing the |differen|
|000006b0| 74 69 61 6c 20 6f 66 20 | 74 68 65 20 74 77 6f 20 |tial of |the two |
|000006c0| 66 69 6c 65 73 2e 22 20 | 3a 74 79 70 65 20 27 73 |files." |:type 's|
|000006d0| 74 72 69 6e 67 20 3a 67 | 72 6f 75 70 20 27 65 64 |tring :g|roup 'ed|
|000006e0| 69 66 66 2d 64 69 66 66 | 29 0a 28 63 75 73 74 6f |iff-diff|).(custo|
|000006f0| 6d 2d 64 65 63 6c 61 72 | 65 2d 76 61 72 69 61 62 |m-declar|e-variab|
|00000700| 6c 65 20 27 65 64 69 66 | 66 2d 64 69 66 66 2d 6f |le 'edif|f-diff-o|
|00000710| 70 74 69 6f 6e 73 20 27 | 22 22 20 22 2a 4f 70 74 |ptions '|"" "*Opt|
|00000720| 69 6f 6e 73 20 74 6f 20 | 70 61 73 73 20 74 6f 20 |ions to |pass to |
|00000730| 60 65 64 69 66 66 2d 64 | 69 66 66 2d 70 72 6f 67 |`ediff-d|iff-prog|
|00000740| 72 61 6d 27 2e 20 5c 6e | 49 66 20 64 69 66 66 28 |ram'. \n|If diff(|
|00000750| 31 29 20 69 73 20 75 73 | 65 64 20 61 73 20 60 65 |1) is us|ed as `e|
|00000760| 64 69 66 66 2d 64 69 66 | 66 2d 70 72 6f 67 72 61 |diff-dif|f-progra|
|00000770| 6d 27 2c 20 74 68 65 6e | 20 74 68 65 20 6d 6f 73 |m', then| the mos|
|00000780| 74 20 75 73 65 66 75 6c | 20 6f 70 74 69 6f 6e 73 |t useful| options|
|00000790| 20 61 72 65 5c 6e 60 2d | 77 27 2c 20 74 6f 20 69 | are\n`-|w', to i|
|000007a0| 67 6e 6f 72 65 20 73 70 | 61 63 65 2c 20 61 6e 64 |gnore sp|ace, and|
|000007b0| 20 60 2d 69 27 2c 20 74 | 6f 20 69 67 6e 6f 72 65 | `-i', t|o ignore|
|000007c0| 20 63 61 73 65 20 6f 66 | 20 6c 65 74 74 65 72 73 | case of| letters|
|000007d0| 2e 5c 6e 41 74 20 70 72 | 65 73 65 6e 74 2c 20 74 |.\nAt pr|esent, t|
|000007e0| 68 65 20 6f 70 74 69 6f | 6e 20 60 2d 63 27 20 69 |he optio|n `-c' i|
|000007f0| 73 20 6e 6f 74 20 61 6c | 6c 6f 77 65 64 2e 22 20 |s not al|lowed." |
|00000800| 3a 74 79 70 65 20 27 73 | 74 72 69 6e 67 20 3a 67 |:type 's|tring :g|
|00000810| 72 6f 75 70 20 27 65 64 | 69 66 66 2d 64 69 66 66 |roup 'ed|iff-diff|
|00000820| 29 0a 28 63 75 73 74 6f | 6d 2d 64 65 63 6c 61 72 |).(custo|m-declar|
|00000830| 65 2d 76 61 72 69 61 62 | 6c 65 20 27 65 64 69 66 |e-variab|le 'edif|
|00000840| 66 2d 63 75 73 74 6f 6d | 2d 64 69 66 66 2d 70 72 |f-custom|-diff-pr|
|00000850| 6f 67 72 61 6d 20 27 65 | 64 69 66 66 2d 64 69 66 |ogram 'e|diff-dif|
|00000860| 66 2d 70 72 6f 67 72 61 | 6d 20 22 2a 50 72 6f 67 |f-progra|m "*Prog|
|00000870| 72 61 6d 20 74 6f 20 75 | 73 65 20 66 6f 72 20 67 |ram to u|se for g|
|00000880| 65 6e 65 72 61 74 69 6e | 67 20 63 75 73 74 6f 6d |eneratin|g custom|
|00000890| 20 64 69 66 66 20 6f 75 | 74 70 75 74 20 66 6f 72 | diff ou|tput for|
|000008a0| 20 73 61 76 69 6e 67 20 | 69 74 20 69 6e 20 61 20 | saving |it in a |
|000008b0| 66 69 6c 65 2e 5c 6e 54 | 68 69 73 20 6f 75 74 70 |file.\nT|his outp|
|000008c0| 75 74 20 69 73 20 6e 6f | 74 20 75 73 65 64 20 62 |ut is no|t used b|
|000008d0| 79 20 45 64 69 66 66 20 | 69 6e 74 65 72 6e 61 6c |y Ediff |internal|
|000008e0| 6c 79 2e 22 20 3a 74 79 | 70 65 20 27 73 74 72 69 |ly." :ty|pe 'stri|
|000008f0| 6e 67 20 3a 67 72 6f 75 | 70 20 27 65 64 69 66 66 |ng :grou|p 'ediff|
|00000900| 2d 64 69 66 66 29 0a 28 | 63 75 73 74 6f 6d 2d 64 |-diff).(|custom-d|
|00000910| 65 63 6c 61 72 65 2d 76 | 61 72 69 61 62 6c 65 20 |eclare-v|ariable |
|00000920| 27 65 64 69 66 66 2d 63 | 75 73 74 6f 6d 2d 64 69 |'ediff-c|ustom-di|
|00000930| 66 66 2d 6f 70 74 69 6f | 6e 73 20 27 22 2d 63 22 |ff-optio|ns '"-c"|
|00000940| 20 22 2a 4f 70 74 69 6f | 6e 73 20 74 6f 20 70 61 | "*Optio|ns to pa|
|00000950| 73 73 20 74 6f 20 60 65 | 64 69 66 66 2d 63 75 73 |ss to `e|diff-cus|
|00000960| 74 6f 6d 2d 64 69 66 66 | 2d 70 72 6f 67 72 61 6d |tom-diff|-program|
|00000970| 27 2e 22 20 3a 74 79 70 | 65 20 27 73 74 72 69 6e |'." :typ|e 'strin|
|00000980| 67 20 3a 67 72 6f 75 70 | 20 27 65 64 69 66 66 2d |g :group| 'ediff-|
|00000990| 64 69 66 66 29 0a 23 40 | 36 39 20 50 61 74 74 65 |diff).#@|69 Patte|
|000009a0| 72 6e 20 74 6f 20 6d 61 | 74 63 68 20 6c 69 6e 65 |rn to ma|tch line|
|000009b0| 73 20 70 72 6f 64 75 63 | 65 64 20 62 79 20 64 69 |s produc|ed by di|
|000009c0| 66 66 33 20 74 68 61 74 | 20 64 65 73 63 72 69 62 |ff3 that| describ|
|000009d0| 65 20 64 69 66 66 65 72 | 65 6e 63 65 73 2e 1f 0a |e differ|ences...|
|000009e0| 28 64 65 66 76 61 72 20 | 65 64 69 66 66 2d 6d 61 |(defvar |ediff-ma|
|000009f0| 74 63 68 2d 64 69 66 66 | 33 2d 6c 69 6e 65 20 22 |tch-diff|3-line "|
|00000a00| 5e 3d 3d 3d 3d 5c 5c 28 | 2e 3f 5c 5c 29 24 22 20 |^====\\(|.?\\)$" |
|00000a10| 28 23 24 20 2e 20 32 34 | 35 39 29 29 0a 28 63 75 |(#$ . 24|59)).(cu|
|00000a20| 73 74 6f 6d 2d 64 65 63 | 6c 61 72 65 2d 76 61 72 |stom-dec|lare-var|
|00000a30| 69 61 62 6c 65 20 27 65 | 64 69 66 66 2d 64 69 66 |iable 'e|diff-dif|
|00000a40| 66 33 2d 70 72 6f 67 72 | 61 6d 20 27 22 64 69 66 |f3-progr|am '"dif|
|00000a50| 66 33 22 20 22 2a 50 72 | 6f 67 72 61 6d 20 74 6f |f3" "*Pr|ogram to|
|00000a60| 20 62 65 20 75 73 65 64 | 20 66 6f 72 20 74 68 72 | be used| for thr|
|00000a70| 65 65 2d 77 61 79 20 63 | 6f 6d 70 61 72 69 73 6f |ee-way c|ompariso|
|00000a80| 6e 2e 5c 6e 4d 75 73 74 | 20 70 72 6f 64 75 63 65 |n.\nMust| produce|
|00000a90| 20 6f 75 74 70 75 74 20 | 63 6f 6d 70 61 74 69 62 | output |compatib|
|00000aa0| 6c 65 20 77 69 74 68 20 | 55 6e 69 78 27 73 20 64 |le with |Unix's d|
|00000ab0| 69 66 66 33 20 70 72 6f | 67 72 61 6d 2e 22 20 3a |iff3 pro|gram." :|
|00000ac0| 74 79 70 65 20 27 73 74 | 72 69 6e 67 20 3a 67 72 |type 'st|ring :gr|
|00000ad0| 6f 75 70 20 27 65 64 69 | 66 66 2d 64 69 66 66 29 |oup 'edi|ff-diff)|
|00000ae0| 0a 28 63 75 73 74 6f 6d | 2d 64 65 63 6c 61 72 65 |.(custom|-declare|
|00000af0| 2d 76 61 72 69 61 62 6c | 65 20 27 65 64 69 66 66 |-variabl|e 'ediff|
|00000b00| 2d 64 69 66 66 33 2d 6f | 70 74 69 6f 6e 73 20 27 |-diff3-o|ptions '|
|00000b10| 22 22 20 22 2a 4f 70 74 | 69 6f 6e 73 20 74 6f 20 |"" "*Opt|ions to |
|00000b20| 70 61 73 73 20 74 6f 20 | 60 65 64 69 66 66 2d 64 |pass to |`ediff-d|
|00000b30| 69 66 66 33 2d 70 72 6f | 67 72 61 6d 27 2e 22 20 |iff3-pro|gram'." |
|00000b40| 3a 74 79 70 65 20 27 73 | 74 72 69 6e 67 20 3a 67 |:type 's|tring :g|
|00000b50| 72 6f 75 70 20 27 65 64 | 69 66 66 2d 64 69 66 66 |roup 'ed|iff-diff|
|00000b60| 29 0a 28 63 75 73 74 6f | 6d 2d 64 65 63 6c 61 72 |).(custo|m-declar|
|00000b70| 65 2d 76 61 72 69 61 62 | 6c 65 20 27 65 64 69 66 |e-variab|le 'edif|
|00000b80| 66 2d 64 69 66 66 33 2d | 6f 6b 2d 6c 69 6e 65 73 |f-diff3-|ok-lines|
|00000b90| 2d 72 65 67 65 78 70 20 | 27 22 5e 5c 5c 28 5b 31 |-regexp |'"^\\([1|
|00000ba0| 2d 33 5d 3a 5c 5c 7c 3d | 3d 3d 3d 5c 5c 7c 20 20 |-3]:\\|=|===\\| |
|00000bb0| 5c 5c 7c 2e 2a 57 61 72 | 6e 69 6e 67 20 2a 3a 5c |\\|.*War|ning *:\|
|00000bc0| 5c 7c 2e 2a 4e 6f 20 6e | 65 77 6c 69 6e 65 5c 5c |\|.*No n|ewline\\|
|00000bd0| 7c 2e 2a 6d 69 73 73 69 | 6e 67 20 6e 65 77 6c 69 ||.*missi|ng newli|
|00000be0| 6e 65 5c 5c 7c 5e 0d 24 | 5c 5c 29 22 20 22 2a 52 |ne\\|^.$|\\)" "*R|
|00000bf0| 65 67 65 78 70 20 74 68 | 61 74 20 6d 61 74 63 68 |egexp th|at match|
|00000c00| 65 73 20 6e 6f 72 6d 61 | 6c 20 6f 75 74 70 75 74 |es norma|l output|
|00000c10| 20 6c 69 6e 65 73 20 66 | 72 6f 6d 20 60 65 64 69 | lines f|rom `edi|
|00000c20| 66 66 2d 64 69 66 66 33 | 2d 70 72 6f 67 72 61 6d |ff-diff3|-program|
|00000c30| 27 2e 5c 6e 4c 69 6e 65 | 73 20 74 68 61 74 20 64 |'.\nLine|s that d|
|00000c40| 6f 20 6e 6f 74 20 6d 61 | 74 63 68 20 61 72 65 20 |o not ma|tch are |
|00000c50| 61 73 73 75 6d 65 64 20 | 74 6f 20 62 65 20 65 72 |assumed |to be er|
|00000c60| 72 6f 72 20 6d 65 73 73 | 61 67 65 73 2e 22 20 3a |ror mess|ages." :|
|00000c70| 74 79 70 65 20 27 72 65 | 67 65 78 70 20 3a 67 72 |type 're|gexp :gr|
|00000c80| 6f 75 70 20 27 65 64 69 | 66 66 2d 64 69 66 66 29 |oup 'edi|ff-diff)|
|00000c90| 0a 23 40 32 20 1f 0a 28 | 64 65 66 76 61 72 20 65 |.#@2 ..(|defvar e|
|00000ca0| 64 69 66 66 2d 64 69 66 | 66 2d 73 74 61 74 75 73 |diff-dif|f-status|
|00000cb0| 20 22 22 20 28 23 24 20 | 2e 20 33 32 32 31 29 29 | "" (#$ |. 3221))|
|00000cc0| 0a 28 62 79 74 65 2d 63 | 6f 64 65 20 22 c0 c1 21 |.(byte-c|ode "..!|
|00000cd0| 88 c2 c1 c3 c4 23 87 22 | 20 5b 6d 61 6b 65 2d 76 |.....#."| [make-v|
|00000ce0| 61 72 69 61 62 6c 65 2d | 62 75 66 66 65 72 2d 6c |ariable-|buffer-l|
|00000cf0| 6f 63 61 6c 20 65 64 69 | 66 66 2d 64 69 66 66 2d |ocal edi|ff-diff-|
|00000d00| 73 74 61 74 75 73 20 70 | 75 74 20 70 65 72 6d 61 |status p|ut perma|
|00000d10| 6e 65 6e 74 2d 6c 6f 63 | 61 6c 20 74 5d 20 34 29 |nent-loc|al t] 4)|
|00000d20| 0a 23 40 33 32 34 20 49 | 66 20 60 6f 6e 27 2c 20 |.#@324 I|f `on', |
|00000d30| 45 64 69 66 66 20 61 75 | 74 6f 2d 68 69 67 68 6c |Ediff au|to-highl|
|00000d40| 69 67 68 74 73 20 66 69 | 6e 65 20 64 69 66 66 73 |ights fi|ne diffs|
|00000d50| 20 66 6f 72 20 74 68 65 | 20 63 75 72 72 65 6e 74 | for the| current|
|00000d60| 20 64 69 66 66 20 72 65 | 67 69 6f 6e 2e 0a 49 66 | diff re|gion..If|
|00000d70| 20 60 6f 66 66 27 2c 20 | 61 75 74 6f 2d 68 69 67 | `off', |auto-hig|
|00000d80| 68 6c 69 67 68 74 69 6e | 67 20 69 73 20 6e 6f 74 |hlightin|g is not|
|00000d90| 20 75 73 65 64 2e 20 49 | 66 20 60 6e 69 78 27 2c | used. I|f `nix',|
|00000da0| 20 6e 6f 20 66 69 6e 65 | 20 64 69 66 66 73 20 61 | no fine| diffs a|
|00000db0| 72 65 20 73 68 6f 77 6e | 0a 61 74 20 61 6c 6c 2c |re shown|.at all,|
|00000dc0| 20 75 6e 6c 65 73 73 20 | 74 68 65 20 75 73 65 72 | unless |the user|
|00000dd0| 20 66 6f 72 63 65 2d 72 | 65 66 69 6e 65 73 20 74 | force-r|efines t|
|00000de0| 68 65 20 72 65 67 69 6f | 6e 20 62 79 20 68 69 74 |he regio|n by hit|
|00000df0| 74 69 6e 67 20 60 2a 27 | 2e 0a 0a 54 68 69 73 20 |ting `*'|...This |
|00000e00| 76 61 72 69 61 62 6c 65 | 20 63 61 6e 20 62 65 20 |variable| can be |
|00000e10| 73 65 74 20 65 69 74 68 | 65 72 20 69 6e 20 2e 65 |set eith|er in .e|
|00000e20| 6d 61 63 73 20 6f 72 20 | 74 6f 67 67 6c 65 64 20 |macs or |toggled |
|00000e30| 69 6e 74 65 72 61 63 74 | 69 76 65 6c 79 2e 0a 55 |interact|ively..U|
|00000e40| 73 65 20 60 73 65 74 71 | 2d 64 65 66 61 75 6c 74 |se `setq|-default|
|00000e50| 27 20 69 66 20 73 65 74 | 74 69 6e 67 20 69 74 20 |' if set|ting it |
|00000e60| 69 6e 20 2e 65 6d 61 63 | 73 1f 0a 28 64 65 66 76 |in .emac|s..(defv|
|00000e70| 61 72 20 65 64 69 66 66 | 2d 61 75 74 6f 2d 72 65 |ar ediff|-auto-re|
|00000e80| 66 69 6e 65 20 28 62 79 | 74 65 2d 63 6f 64 65 20 |fine (by|te-code |
|00000e90| 22 c0 20 ab 82 c1 87 c2 | 87 22 20 5b 65 64 69 66 |". .....|." [edif|
|00000ea0| 66 2d 68 61 73 2d 66 61 | 63 65 2d 73 75 70 70 6f |f-has-fa|ce-suppo|
|00000eb0| 72 74 2d 70 20 6f 6e 20 | 6e 69 78 5d 20 31 29 20 |rt-p on |nix] 1) |
|00000ec0| 28 23 24 20 2e 20 33 33 | 36 37 29 29 0a 28 62 79 |(#$ . 33|67)).(by|
|00000ed0| 74 65 2d 63 6f 64 65 20 | 22 c0 c1 21 88 c2 c1 c3 |te-code |"..!....|
|00000ee0| c4 23 87 22 20 5b 6d 61 | 6b 65 2d 76 61 72 69 61 |.#." [ma|ke-varia|
|00000ef0| 62 6c 65 2d 62 75 66 66 | 65 72 2d 6c 6f 63 61 6c |ble-buff|er-local|
|00000f00| 20 65 64 69 66 66 2d 61 | 75 74 6f 2d 72 65 66 69 | ediff-a|uto-refi|
|00000f10| 6e 65 20 70 75 74 20 70 | 65 72 6d 61 6e 65 6e 74 |ne put p|ermanent|
|00000f20| 2d 6c 6f 63 61 6c 20 74 | 5d 20 34 29 0a 23 40 32 |-local t|] 4).#@2|
|00000f30| 30 31 20 2a 49 66 20 74 | 2c 20 73 6b 69 70 20 6f |01 *If t|, skip o|
|00000f40| 76 65 72 20 64 69 66 66 | 65 72 65 6e 63 65 20 72 |ver diff|erence r|
|00000f50| 65 67 69 6f 6e 73 20 74 | 68 61 74 20 64 69 66 66 |egions t|hat diff|
|00000f60| 65 72 20 6f 6e 6c 79 20 | 69 6e 20 74 68 65 20 77 |er only |in the w|
|00000f70| 68 69 74 65 20 73 70 61 | 63 65 20 61 6e 64 20 6c |hite spa|ce and l|
|00000f80| 69 6e 65 20 62 72 65 61 | 6b 73 2e 0a 54 68 69 73 |ine brea|ks..This|
|00000f90| 20 76 61 72 69 61 62 6c | 65 20 63 61 6e 20 62 65 | variabl|e can be|
|00000fa0| 20 73 65 74 20 65 69 74 | 68 65 72 20 69 6e 20 2e | set eit|her in .|
|00000fb0| 65 6d 61 63 73 20 6f 72 | 20 74 6f 67 67 6c 65 64 |emacs or| toggled|
|00000fc0| 20 69 6e 74 65 72 61 63 | 74 69 76 65 6c 79 2e 0a | interac|tively..|
|00000fd0| 55 73 65 20 60 73 65 74 | 71 2d 64 65 66 61 75 6c |Use `set|q-defaul|
|00000fe0| 74 27 20 69 66 20 73 65 | 74 74 69 6e 67 20 69 74 |t' if se|tting it|
|00000ff0| 20 69 6e 20 2e 65 6d 61 | 63 73 1f 0a 28 64 65 66 | in .ema|cs..(def|
|00001000| 76 61 72 20 65 64 69 66 | 66 2d 69 67 6e 6f 72 65 |var edif|f-ignore|
|00001010| 2d 73 69 6d 69 6c 61 72 | 2d 72 65 67 69 6f 6e 73 |-similar|-regions|
|00001020| 20 6e 69 6c 20 28 23 24 | 20 2e 20 2d 33 38 39 31 | nil (#$| . -3891|
|00001030| 29 29 0a 28 62 79 74 65 | 2d 63 6f 64 65 20 22 c0 |)).(byte|-code ".|
|00001040| c1 21 88 c2 c1 c3 c4 23 | 87 22 20 5b 6d 61 6b 65 |.!.....#|." [make|
|00001050| 2d 76 61 72 69 61 62 6c | 65 2d 62 75 66 66 65 72 |-variabl|e-buffer|
|00001060| 2d 6c 6f 63 61 6c 20 65 | 64 69 66 66 2d 69 67 6e |-local e|diff-ign|
|00001070| 6f 72 65 2d 73 69 6d 69 | 6c 61 72 2d 72 65 67 69 |ore-simi|lar-regi|
|00001080| 6f 6e 73 20 70 75 74 20 | 70 65 72 6d 61 6e 65 6e |ons put |permanen|
|00001090| 74 2d 6c 6f 63 61 6c 20 | 74 5d 20 34 29 0a 23 40 |t-local |t] 4).#@|
|000010a0| 36 34 20 2a 41 75 74 6f | 2d 72 65 66 69 6e 65 20 |64 *Auto|-refine |
|000010b0| 6f 6e 6c 79 20 74 68 65 | 20 72 65 67 69 6f 6e 73 |only the| regions|
|000010c0| 20 6f 66 20 74 68 69 73 | 20 73 69 7a 65 20 28 69 | of this| size (i|
|000010d0| 6e 20 62 79 74 65 73 29 | 20 6f 72 20 6c 65 73 73 |n bytes)| or less|
|000010e0| 2e 1f 0a 28 64 65 66 76 | 61 72 20 65 64 69 66 66 |...(defv|ar ediff|
|000010f0| 2d 61 75 74 6f 2d 72 65 | 66 69 6e 65 2d 6c 69 6d |-auto-re|fine-lim|
|00001100| 69 74 20 31 34 30 30 20 | 28 23 24 20 2e 20 2d 34 |it 1400 |(#$ . -4|
|00001110| 32 35 39 29 29 0a 28 62 | 79 74 65 2d 63 6f 64 65 |259)).(b|yte-code|
|00001120| 20 22 c0 c1 21 88 c2 c1 | c3 c4 23 87 22 20 5b 6d | "..!...|..#." [m|
|00001130| 61 6b 65 2d 76 61 72 69 | 61 62 6c 65 2d 62 75 66 |ake-vari|able-buf|
|00001140| 66 65 72 2d 6c 6f 63 61 | 6c 20 65 64 69 66 66 2d |fer-loca|l ediff-|
|00001150| 61 75 74 6f 2d 72 65 66 | 69 6e 65 2d 6c 69 6d 69 |auto-ref|ine-limi|
|00001160| 74 20 70 75 74 20 70 65 | 72 6d 61 6e 65 6e 74 2d |t put pe|rmanent-|
|00001170| 6c 6f 63 61 6c 20 74 5d | 20 34 29 0a 23 40 32 36 |local t]| 4).#@26|
|00001180| 30 20 52 65 67 65 78 70 | 20 74 68 61 74 20 6d 61 |0 Regexp| that ma|
|00001190| 74 63 68 65 73 20 6e 6f | 72 6d 61 6c 20 6f 75 74 |tches no|rmal out|
|000011a0| 70 75 74 20 6c 69 6e 65 | 73 20 66 72 6f 6d 20 60 |put line|s from `|
|000011b0| 65 64 69 66 66 2d 64 69 | 66 66 2d 70 72 6f 67 72 |ediff-di|ff-progr|
|000011c0| 61 6d 27 2e 0a 54 68 69 | 73 20 69 73 20 6d 6f 73 |am'..Thi|s is mos|
|000011d0| 74 6c 79 20 6c 69 66 74 | 65 64 20 66 72 6f 6d 20 |tly lift|ed from |
|000011e0| 45 6d 65 72 67 65 2c 20 | 65 78 63 65 70 74 20 74 |Emerge, |except t|
|000011f0| 68 61 74 20 45 64 69 66 | 66 20 61 6c 73 6f 20 63 |hat Edif|f also c|
|00001200| 6f 6e 73 69 64 65 72 73 | 0a 77 61 72 6e 69 6e 67 |onsiders|.warning|
|00001210| 73 20 61 6e 64 20 60 4d | 69 73 73 69 6e 67 20 6e |s and `M|issing n|
|00001220| 65 77 6c 69 6e 65 27 2d | 74 79 70 65 20 6d 65 73 |ewline'-|type mes|
|00001230| 73 61 67 65 73 20 74 6f | 20 62 65 20 6e 6f 72 6d |sages to| be norm|
|00001240| 61 6c 20 6f 75 74 70 75 | 74 2e 0a 4c 69 6e 65 73 |al outpu|t..Lines|
|00001250| 20 74 68 61 74 20 64 6f | 20 6e 6f 74 20 6d 61 74 | that do| not mat|
|00001260| 63 68 20 61 72 65 20 61 | 73 73 75 6d 65 64 20 74 |ch are a|ssumed t|
|00001270| 6f 20 62 65 20 65 72 72 | 6f 72 20 6d 65 73 73 61 |o be err|or messa|
|00001280| 67 65 73 2e 1f 0a 28 64 | 65 66 76 61 72 20 65 64 |ges...(d|efvar ed|
|00001290| 69 66 66 2d 64 69 66 66 | 2d 6f 6b 2d 6c 69 6e 65 |iff-diff|-ok-line|
|000012a0| 73 2d 72 65 67 65 78 70 | 20 28 63 6f 6e 63 61 74 |s-regexp| (concat|
|000012b0| 20 22 5e 5c 5c 28 22 20 | 22 5b 30 2d 39 2c 5d 2b | "^\\(" |"[0-9,]+|
|000012c0| 5b 61 63 64 5d 5b 30 2d | 39 2c 5d 2b 0d 3f 24 22 |[acd][0-|9,]+.?$"|
|000012d0| 20 22 5c 5c 7c 5b 3c 3e | 5d 20 22 20 22 5c 5c 7c | "\\|[<>|] " "\\||
|000012e0| 2d 2d 2d 22 20 22 5c 5c | 7c 2e 2a 57 61 72 6e 69 |---" "\\||.*Warni|
|000012f0| 6e 67 20 2a 3a 22 20 22 | 5c 5c 7c 2e 2a 4e 6f 20 |ng *:" "|\\|.*No |
|00001300| 2b 6e 65 77 6c 69 6e 65 | 22 20 22 5c 5c 7c 2e 2a |+newline|" "\\|.*|
|00001310| 6d 69 73 73 69 6e 67 20 | 2b 6e 65 77 6c 69 6e 65 |missing |+newline|
|00001320| 22 20 22 5c 5c 7c 5e 0d | 3f 24 22 20 22 5c 5c 29 |" "\\|^.|?$" "\\)|
|00001330| 22 29 20 28 23 24 20 2e | 20 34 34 38 32 29 29 0a |") (#$ .| 4482)).|
|00001340| 23 40 36 38 20 50 61 74 | 74 65 72 6e 20 74 6f 20 |#@68 Pat|tern to |
|00001350| 6d 61 74 63 68 20 6c 69 | 6e 65 73 20 70 72 6f 64 |match li|nes prod|
|00001360| 75 63 65 64 20 62 79 20 | 64 69 66 66 20 74 68 61 |uced by |diff tha|
|00001370| 74 20 64 65 73 63 72 69 | 62 65 20 64 69 66 66 65 |t descri|be diffe|
|00001380| 72 65 6e 63 65 73 2e 1f | 0a 28 64 65 66 76 61 72 |rences..|.(defvar|
|00001390| 20 65 64 69 66 66 2d 6d | 61 74 63 68 2d 64 69 66 | ediff-m|atch-dif|
|000013a0| 66 2d 6c 69 6e 65 20 28 | 62 79 74 65 2d 63 6f 64 |f-line (|byte-cod|
|000013b0| 65 20 22 c0 19 c2 09 c3 | 09 c4 b0 05 29 87 22 20 |e ".....|....)." |
|000013c0| 5b 22 5c 5c 28 5b 30 2d | 39 5d 2b 5c 5c 29 5c 5c |["\\([0-|9]+\\)\\|
|000013d0| 28 5c 5c 7c 2c 5c 5c 28 | 5b 30 2d 39 5d 2b 5c 5c |(\\|,\\(|[0-9]+\\|
|000013e0| 29 5c 5c 29 22 20 78 20 | 22 5e 22 20 22 5c 5c 28 |)\\)" x |"^" "\\(|
|000013f0| 5b 61 63 64 5d 5c 5c 29 | 22 20 22 0d 3f 24 22 5d |[acd]\\)|" ".?$"]|
|00001400| 20 35 29 20 28 23 24 20 | 2e 20 34 39 33 33 29 29 | 5) (#$ |. 4933))|
|00001410| 0a 23 40 34 30 32 20 76 | 61 6c 75 65 20 69 73 20 |.#@402 v|alue is |
|00001420| 61 20 66 75 6e 63 74 69 | 6f 6e 20 73 79 6d 62 6f |a functi|on symbo|
|00001430| 6c 20 64 65 70 65 6e 64 | 69 6e 67 20 6f 6e 20 74 |l depend|ing on t|
|00001440| 68 65 20 6b 69 6e 64 20 | 6f 66 20 6a 6f 62 20 69 |he kind |of job i|
|00001450| 73 20 74 6f 20 62 65 20 | 64 6f 6e 65 2e 0a 46 6f |s to be |done..Fo|
|00001460| 72 20 32 2d 77 61 79 20 | 6a 6f 62 73 20 61 6e 64 |r 2-way |jobs and|
|00001470| 20 66 6f 72 20 65 64 69 | 66 66 2d 6d 65 72 67 65 | for edi|ff-merge|
|00001480| 2c 20 69 74 20 73 68 6f | 75 6c 64 20 62 65 20 60 |, it sho|uld be `|
|00001490| 65 64 69 66 66 2d 73 65 | 74 75 70 2d 64 69 66 66 |ediff-se|tup-diff|
|000014a0| 2d 72 65 67 69 6f 6e 73 | 27 2e 0a 46 6f 72 20 6a |-regions|'..For j|
|000014b0| 6f 62 73 20 72 65 71 75 | 69 72 69 6e 67 20 64 69 |obs requ|iring di|
|000014c0| 66 66 33 2c 20 69 74 20 | 73 68 6f 75 6c 64 20 62 |ff3, it |should b|
|000014d0| 65 20 60 65 64 69 66 66 | 2d 73 65 74 75 70 2d 64 |e `ediff|-setup-d|
|000014e0| 69 66 66 2d 72 65 67 69 | 6f 6e 73 33 27 2e 0a 0a |iff-regi|ons3'...|
|000014f0| 54 68 65 20 66 75 6e 63 | 74 69 6f 6e 20 73 68 6f |The func|tion sho|
|00001500| 75 6c 64 20 74 61 6b 65 | 20 74 68 72 65 65 20 6d |uld take| three m|
|00001510| 61 6e 64 61 74 6f 72 79 | 20 61 72 67 75 6d 65 6e |andatory| argumen|
|00001520| 74 73 2c 20 66 69 6c 65 | 2d 41 2c 20 66 69 6c 65 |ts, file|-A, file|
|00001530| 2d 42 2c 20 61 6e 64 0a | 66 69 6c 65 2d 43 2e 20 |-B, and.|file-C. |
|00001540| 49 74 20 6d 61 79 20 69 | 67 6e 6f 72 65 20 66 69 |It may i|gnore fi|
|00001550| 6c 65 20 43 20 66 6f 72 | 20 64 69 66 66 32 20 6a |le C for| diff2 j|
|00001560| 6f 62 73 2e 20 49 74 20 | 73 68 6f 75 6c 64 20 61 |obs. It |should a|
|00001570| 6c 73 6f 20 74 61 6b 65 | 0a 6f 6e 65 20 6f 70 74 |lso take|.one opt|
|00001580| 69 6f 6e 61 6c 20 61 72 | 67 75 6d 65 6e 74 73 2c |ional ar|guments,|
|00001590| 20 64 69 66 66 2d 6e 75 | 6d 62 65 72 20 74 6f 20 | diff-nu|mber to |
|000015a0| 72 65 66 69 6e 65 2e 1f | 0a 28 64 65 66 76 61 72 |refine..|.(defvar|
|000015b0| 20 65 64 69 66 66 2d 73 | 65 74 75 70 2d 64 69 66 | ediff-s|etup-dif|
|000015c0| 66 2d 72 65 67 69 6f 6e | 73 2d 66 75 6e 63 74 69 |f-region|s-functi|
|000015d0| 6f 6e 20 6e 69 6c 20 28 | 23 24 20 2e 20 35 31 34 |on nil (|#$ . 514|
|000015e0| 33 29 29 0a 28 62 79 74 | 65 2d 63 6f 64 65 20 22 |3)).(byt|e-code "|
|000015f0| c0 c1 21 88 c2 c1 c3 c4 | 23 87 22 20 5b 6d 61 6b |..!.....|#." [mak|
|00001600| 65 2d 76 61 72 69 61 62 | 6c 65 2d 62 75 66 66 65 |e-variab|le-buffe|
|00001610| 72 2d 6c 6f 63 61 6c 20 | 65 64 69 66 66 2d 73 65 |r-local |ediff-se|
|00001620| 74 75 70 2d 64 69 66 66 | 2d 72 65 67 69 6f 6e 73 |tup-diff|-regions|
|00001630| 2d 66 75 6e 63 74 69 6f | 6e 20 70 75 74 20 70 65 |-functio|n put pe|
|00001640| 72 6d 61 6e 65 6e 74 2d | 6c 6f 63 61 6c 20 74 5d |rmanent-|local t]|
|00001650| 20 34 29 0a 28 64 65 66 | 61 6c 69 61 73 20 27 65 | 4).(def|alias 'e|
|00001660| 64 69 66 66 2d 73 65 74 | 75 70 2d 64 69 66 66 2d |diff-set|up-diff-|
|00001670| 72 65 67 69 6f 6e 73 20 | 23 5b 28 66 69 6c 65 2d |regions |#[(file-|
|00001680| 41 20 66 69 6c 65 2d 42 | 20 66 69 6c 65 2d 43 29 |A file-B| file-C)|
|00001690| 20 22 c0 c1 5c 6e 5c 22 | ab 84 c3 c4 21 88 0d ab | "..\n\"|....!...|
|000016a0| 8c c6 0d 21 ab 87 c7 c6 | 0d 21 21 ac 87 c8 c9 ca |...!....|.!!.....|
|000016b0| cb 5c 22 21 15 cc 0d 0e | 0d 0e 0e 23 88 cf 0e 10 |.\"!....|...#....|
|000016c0| 0d 5c 22 88 d1 d2 0d 0e | 13 0e 14 23 21 87 22 20 |.\".....|...#!." |
|000016d0| 5b 73 74 72 69 6e 67 2d | 6d 61 74 63 68 20 22 63 |[string-|match "c|
|000016e0| 22 20 65 64 69 66 66 2d | 64 69 66 66 2d 6f 70 74 |" ediff-|diff-opt|
|000016f0| 69 6f 6e 73 20 65 72 72 | 6f 72 20 22 4f 70 74 69 |ions err|or "Opti|
|00001700| 6f 6e 20 60 2d 63 27 20 | 69 73 20 6e 6f 74 20 61 |on `-c' |is not a|
|00001710| 6c 6c 6f 77 65 64 20 69 | 6e 20 60 65 64 69 66 66 |llowed i|n `ediff|
|00001720| 2d 64 69 66 66 2d 6f 70 | 74 69 6f 6e 73 27 22 20 |-diff-op|tions'" |
|00001730| 65 64 69 66 66 2d 64 69 | 66 66 2d 62 75 66 66 65 |ediff-di|ff-buffe|
|00001740| 72 20 67 65 74 2d 62 75 | 66 66 65 72 20 62 75 66 |r get-bu|ffer buf|
|00001750| 66 65 72 2d 6e 61 6d 65 | 20 67 65 74 2d 62 75 66 |fer-name| get-buf|
|00001760| 66 65 72 2d 63 72 65 61 | 74 65 20 65 64 69 66 66 |fer-crea|te ediff|
|00001770| 2d 75 6e 69 71 75 65 2d | 62 75 66 66 65 72 2d 6e |-unique-|buffer-n|
|00001780| 61 6d 65 20 22 2a 65 64 | 69 66 66 2d 64 69 66 66 |ame "*ed|iff-diff|
|00001790| 22 20 22 2a 22 20 65 64 | 69 66 66 2d 6d 61 6b 65 |" "*" ed|iff-make|
|000017a0| 2d 64 69 66 66 32 2d 62 | 75 66 66 65 72 20 66 69 |-diff2-b|uffer fi|
|000017b0| 6c 65 2d 41 20 66 69 6c | 65 2d 42 20 65 64 69 66 |le-A fil|e-B edif|
|000017c0| 66 2d 70 72 65 70 61 72 | 65 2d 65 72 72 6f 72 2d |f-prepar|e-error-|
|000017d0| 6c 69 73 74 20 65 64 69 | 66 66 2d 64 69 66 66 2d |list edi|ff-diff-|
|000017e0| 6f 6b 2d 6c 69 6e 65 73 | 2d 72 65 67 65 78 70 20 |ok-lines|-regexp |
|000017f0| 65 64 69 66 66 2d 63 6f | 6e 76 65 72 74 2d 64 69 |ediff-co|nvert-di|
|00001800| 66 66 73 2d 74 6f 2d 6f | 76 65 72 6c 61 79 73 20 |ffs-to-o|verlays |
|00001810| 65 64 69 66 66 2d 65 78 | 74 72 61 63 74 2d 64 69 |ediff-ex|tract-di|
|00001820| 66 66 73 20 65 64 69 66 | 66 2d 77 6f 72 64 2d 6d |ffs edif|f-word-m|
|00001830| 6f 64 65 20 65 64 69 66 | 66 2d 6e 61 72 72 6f 77 |ode edif|f-narrow|
|00001840| 2d 62 6f 75 6e 64 73 5d | 20 35 5d 29 0a 28 64 65 |-bounds]| 5]).(de|
|00001850| 66 61 6c 69 61 73 20 27 | 65 64 69 66 66 2d 6d 61 |falias '|ediff-ma|
|00001860| 6b 65 2d 64 69 66 66 32 | 2d 62 75 66 66 65 72 20 |ke-diff2|-buffer |
|00001870| 23 5b 28 64 69 66 66 2d | 62 75 66 66 65 72 20 66 |#[(diff-|buffer f|
|00001880| 69 6c 65 31 20 66 69 6c | 65 32 29 20 22 08 19 c2 |ile1 fil|e2) "...|
|00001890| 09 c3 5c 22 29 0c 19 c2 | 09 c3 5c 22 29 1d 89 1e |..\")...|..\")...|
|000018a0| 06 a7 ac 8e c7 c8 c9 08 | 21 5c 22 88 ca cb 21 88 |........|!\"...!.|
|000018b0| cc aa fe 0d a7 ac 8e c7 | c8 c9 0c 21 5c 22 88 ca |........|...!\"..|
|000018c0| cb 21 88 cc aa ec 0e 06 | cd 57 ab 8e c7 ce c9 08 |.!......|.W......|
|000018d0| 21 5c 22 88 ca cb 21 88 | cc aa d8 0d cd 57 ab 92 |!\"...!.|.....W..|
|000018e0| c7 cf c9 0c 21 5c 22 88 | ca cb 21 88 c7 d0 21 88 |....!\".|..!...!.|
|000018f0| cc aa c1 c7 d1 d2 08 21 | d2 0c 21 23 88 d3 0e 14 |.......!|..!#....|
|00001900| 0e 15 d6 0e 17 08 0c 26 | 06 88 c7 d0 21 88 0e 15 |.......&|....!...|
|00001910| ab 98 d8 0e 15 21 ab 92 | d9 d8 0e 15 21 21 ab 8a |.....!..|....!!..|
|00001920| 72 0e 15 71 88 da 20 29 | aa 8a 0e 1b dc 61 ae 84 |r..q.. )|.....a..|
|00001930| dd 0e 1e 21 2a 87 22 20 | 5b 66 69 6c 65 31 20 66 |...!*." |[file1 f|
|00001940| 69 6c 65 6e 61 6d 65 20 | 65 64 69 66 66 2d 66 69 |ilename |ediff-fi|
|00001950| 6c 65 2d 61 74 74 72 69 | 62 75 74 65 73 20 37 20 |le-attri|butes 7 |
|00001960| 66 69 6c 65 32 20 66 69 | 6c 65 32 2d 73 69 7a 65 |file2 fi|le2-size|
|00001970| 20 66 69 6c 65 31 2d 73 | 69 7a 65 20 6d 65 73 73 | file1-s|ize mess|
|00001980| 61 67 65 20 22 43 61 6e | 27 74 20 66 69 6e 64 20 |age "Can|'t find |
|00001990| 66 69 6c 65 3a 20 25 73 | 22 20 65 64 69 66 66 2d |file: %s|" ediff-|
|000019a0| 61 62 62 72 65 76 69 61 | 74 65 2d 66 69 6c 65 2d |abbrevia|te-file-|
|000019b0| 6e 61 6d 65 20 73 69 74 | 2d 66 6f 72 20 32 20 31 |name sit|-for 2 1|
|000019c0| 20 30 20 22 43 61 6e 27 | 74 20 64 69 66 66 20 72 | 0 "Can'|t diff r|
|000019d0| 65 6d 6f 74 65 20 66 69 | 6c 65 73 3a 20 25 73 22 |emote fi|les: %s"|
|000019e0| 20 22 43 61 6e 27 74 20 | 64 69 66 66 20 72 65 6d | "Can't |diff rem|
|000019f0| 6f 74 65 20 66 69 6c 65 | 3a 20 25 73 22 20 22 22 |ote file|: %s" ""|
|00001a00| 20 22 43 6f 6d 70 75 74 | 69 6e 67 20 64 69 66 66 | "Comput|ing diff|
|00001a10| 65 72 65 6e 63 65 73 20 | 62 65 74 77 65 65 6e 20 |erences |between |
|00001a20| 25 73 20 61 6e 64 20 25 | 73 20 2e 2e 2e 22 20 66 |%s and %|s ..." f|
|00001a30| 69 6c 65 2d 6e 61 6d 65 | 2d 6e 6f 6e 64 69 72 65 |ile-name|-nondire|
|00001a40| 63 74 6f 72 79 20 65 64 | 69 66 66 2d 65 78 65 63 |ctory ed|iff-exec|
|00001a50| 2d 70 72 6f 63 65 73 73 | 20 65 64 69 66 66 2d 64 |-process| ediff-d|
|00001a60| 69 66 66 2d 70 72 6f 67 | 72 61 6d 20 64 69 66 66 |iff-prog|ram diff|
|00001a70| 2d 62 75 66 66 65 72 20 | 73 79 6e 63 68 72 6f 6e |-buffer |synchron|
|00001a80| 69 7a 65 20 65 64 69 66 | 66 2d 64 69 66 66 2d 6f |ize edif|f-diff-o|
|00001a90| 70 74 69 6f 6e 73 20 67 | 65 74 2d 62 75 66 66 65 |ptions g|et-buffe|
|00001aa0| 72 20 62 75 66 66 65 72 | 2d 6e 61 6d 65 20 62 75 |r buffer|-name bu|
|00001ab0| 66 66 65 72 2d 73 69 7a | 65 20 74 68 69 73 2d 63 |ffer-siz|e this-c|
|00001ac0| 6f 6d 6d 61 6e 64 20 65 | 64 69 66 66 2d 71 75 69 |ommand e|diff-qui|
|00001ad0| 74 20 65 72 72 6f 72 20 | 65 64 69 66 66 2d 4b 49 |t error |ediff-KI|
|00001ae0| 4c 4c 45 44 2d 56 49 54 | 41 4c 2d 42 55 46 46 45 |LLED-VIT|AL-BUFFE|
|00001af0| 52 5d 20 38 5d 29 0a 28 | 64 65 66 61 6c 69 61 73 |R] 8]).(|defalias|
|00001b00| 20 27 65 64 69 66 66 2d | 73 65 74 75 70 2d 66 69 | 'ediff-|setup-fi|
|00001b10| 6e 65 2d 64 69 66 66 2d | 72 65 67 69 6f 6e 73 20 |ne-diff-|regions |
|00001b20| 23 5b 28 66 69 6c 65 2d | 41 20 66 69 6c 65 2d 42 |#[(file-|A file-B|
|00001b30| 20 66 69 6c 65 2d 43 20 | 72 65 67 2d 6e 75 6d 29 | file-C |reg-num)|
|00001b40| 20 22 08 ab 8c c1 08 21 | ab 87 c2 c1 08 21 21 ac | ".....!|.....!!.|
|00001b50| 87 c3 c4 c5 c6 5c 22 21 | 10 c7 89 89 89 89 1e 08 |.....\"!|........|
|00001b60| 1e 09 1e 5c 6e 1e 0b 1e | 0c 0e 0d 89 16 0c ab 84 |...\n...|........|
|00001b70| 0e 0e aa 82 0e 0f 16 0b | 0e 0c ab 84 0e 10 aa 82 |........|........|
|00001b80| 0e 11 16 5c 6e 0e 0c ab | 84 0e 12 aa 82 0e 13 16 |...\n...|........|
|00001b90| 09 d4 0e 15 54 43 1e 16 | 1e 17 0e 18 ab 88 d9 da |....TC..|........|
|00001ba0| 0e 17 0e 16 23 88 2a db | 0e 0b 08 dc 0e 5c 6e 0e |....#.*.|.....\n.|
|00001bb0| 1d ab 84 0e 1d aa 82 0e | 1e 0e 1e ab 84 0e 1e aa |........|........|
|00001bc0| 82 0e 1d 0e 0c ad 8a 0e | 1f ab 84 0e 1f aa 82 0e |........|........|
|00001bd0| 1e 26 07 88 e0 0e 09 08 | 5c 22 88 e1 c7 1e 16 1e |.&......|\"......|
|00001be0| 17 0e 18 ab 88 d9 da 0e | 17 0e 16 23 88 2a 0e 0c |........|...#.*..|
|00001bf0| ab 87 e2 08 e3 e4 23 aa | 84 e5 08 e4 5c 22 16 08 |......#.|....\"..|
|00001c00| 0e 0c ab a5 0e 1d ac 89 | e6 e7 0e 08 41 5c 22 88 |........|....A\".|
|00001c10| aa 98 0e 1e ac 89 e6 e8 | 0e 08 41 5c 22 88 aa 8b |........|..A\"...|
|00001c20| 0e 1f ac 87 e6 e9 0e 08 | 41 5c 22 88 0e 08 0e 15 |........|A\".....|
|00001c30| 1e 2a 1e 08 eb ec 0e 08 | 0e 2a 23 88 eb ed 0e 08 |.*......|.*#.....|
|00001c40| 0e 2a 23 88 0e 0d ad 87 | eb ee 0e 08 0e 2a 23 2e |.*#.....|.....*#.|
|00001c50| 07 87 22 20 5b 65 64 69 | 66 66 2d 66 69 6e 65 2d |.." [edi|ff-fine-|
|00001c60| 64 69 66 66 2d 62 75 66 | 66 65 72 20 67 65 74 2d |diff-buf|fer get-|
|00001c70| 62 75 66 66 65 72 20 62 | 75 66 66 65 72 2d 6e 61 |buffer b|uffer-na|
|00001c80| 6d 65 20 67 65 74 2d 62 | 75 66 66 65 72 2d 63 72 |me get-b|uffer-cr|
|00001c90| 65 61 74 65 20 65 64 69 | 66 66 2d 75 6e 69 71 75 |eate edi|ff-uniqu|
|00001ca0| 65 2d 62 75 66 66 65 72 | 2d 6e 61 6d 65 20 22 2a |e-buffer|-name "*|
|00001cb0| 65 64 69 66 66 2d 66 69 | 6e 65 2d 64 69 66 66 22 |ediff-fi|ne-diff"|
|00001cc0| 20 22 2a 22 20 6e 69 6c | 20 64 69 66 66 2d 6c 69 | "*" nil| diff-li|
|00001cd0| 73 74 20 6f 6b 2d 72 65 | 67 65 78 70 20 64 69 66 |st ok-re|gexp dif|
|00001ce0| 66 2d 6f 70 74 69 6f 6e | 73 20 64 69 66 66 2d 70 |f-option|s diff-p|
|00001cf0| 72 6f 67 72 61 6d 20 64 | 69 66 66 33 2d 6a 6f 62 |rogram d|iff3-job|
|00001d00| 20 65 64 69 66 66 2d 33 | 77 61 79 2d 6a 6f 62 20 | ediff-3|way-job |
|00001d10| 65 64 69 66 66 2d 64 69 | 66 66 33 2d 70 72 6f 67 |ediff-di|ff3-prog|
|00001d20| 72 61 6d 20 65 64 69 66 | 66 2d 64 69 66 66 2d 70 |ram edif|f-diff-p|
|00001d30| 72 6f 67 72 61 6d 20 65 | 64 69 66 66 2d 64 69 66 |rogram e|diff-dif|
|00001d40| 66 33 2d 6f 70 74 69 6f | 6e 73 20 65 64 69 66 66 |f3-optio|ns ediff|
|00001d50| 2d 64 69 66 66 2d 6f 70 | 74 69 6f 6e 73 20 65 64 |-diff-op|tions ed|
|00001d60| 69 66 66 2d 64 69 66 66 | 33 2d 6f 6b 2d 6c 69 6e |iff-diff|3-ok-lin|
|00001d70| 65 73 2d 72 65 67 65 78 | 70 20 65 64 69 66 66 2d |es-regex|p ediff-|
|00001d80| 64 69 66 66 2d 6f 6b 2d | 6c 69 6e 65 73 2d 72 65 |diff-ok-|lines-re|
|00001d90| 67 65 78 70 20 22 52 65 | 66 69 6e 69 6e 67 20 64 |gexp "Re|fining d|
|00001da0| 69 66 66 65 72 65 6e 63 | 65 20 72 65 67 69 6f 6e |ifferenc|e region|
|00001db0| 20 25 64 20 2e 2e 2e 22 | 20 72 65 67 2d 6e 75 6d | %d ..."| reg-num|
|00001dc0| 20 61 72 67 73 20 73 74 | 72 69 6e 67 20 65 64 69 | args st|ring edi|
|00001dd0| 66 66 2d 76 65 72 62 6f | 73 65 2d 70 20 61 70 70 |ff-verbo|se-p app|
|00001de0| 6c 79 20 6d 65 73 73 61 | 67 65 20 65 64 69 66 66 |ly messa|ge ediff|
|00001df0| 2d 65 78 65 63 2d 70 72 | 6f 63 65 73 73 20 73 79 |-exec-pr|ocess sy|
|00001e00| 6e 63 68 72 6f 6e 69 7a | 65 20 66 69 6c 65 2d 41 |nchroniz|e file-A|
|00001e10| 20 66 69 6c 65 2d 42 20 | 66 69 6c 65 2d 43 20 65 | file-B |file-C e|
|00001e20| 64 69 66 66 2d 70 72 65 | 70 61 72 65 2d 65 72 72 |diff-pre|pare-err|
|00001e30| 6f 72 2d 6c 69 73 74 20 | 22 22 20 65 64 69 66 66 |or-list |"" ediff|
|00001e40| 2d 65 78 74 72 61 63 74 | 2d 64 69 66 66 73 33 20 |-extract|-diffs3 |
|00001e50| 33 77 61 79 2d 63 6f 6d | 70 61 72 69 73 6f 6e 20 |3way-com|parison |
|00001e60| 77 6f 72 64 2d 6d 6f 64 | 65 20 65 64 69 66 66 2d |word-mod|e ediff-|
|00001e70| 65 78 74 72 61 63 74 2d | 64 69 66 66 73 20 6d 61 |extract-|diffs ma|
|00001e80| 70 63 61 72 20 23 5b 28 | 65 6c 74 29 20 22 08 c1 |pcar #[(|elt) "..|
|00001e90| c2 49 88 08 c3 c2 49 87 | 22 20 5b 65 6c 74 20 30 |.I....I.|" [elt 0|
|00001ea0| 20 6e 69 6c 20 31 5d 20 | 33 5d 20 23 5b 28 65 6c | nil 1] |3] #[(el|
|00001eb0| 74 29 20 22 08 c1 c2 49 | 88 08 c3 c2 49 87 22 20 |t) "...I|....I." |
|00001ec0| 5b 65 6c 74 20 32 20 6e | 69 6c 20 33 5d 20 33 5d |[elt 2 n|il 3] 3]|
|00001ed0| 20 23 5b 28 65 6c 74 29 | 20 22 08 c1 c2 49 88 08 | #[(elt)| "...I..|
|00001ee0| c3 c2 49 87 22 20 5b 65 | 6c 74 20 34 20 6e 69 6c |..I." [e|lt 4 nil|
|00001ef0| 20 35 5d 20 33 5d 20 72 | 65 67 69 6f 6e 2d 6e 75 | 5] 3] r|egion-nu|
|00001f00| 6d 20 65 64 69 66 66 2d | 73 65 74 2d 66 69 6e 65 |m ediff-|set-fine|
|00001f10| 2d 6f 76 65 72 6c 61 79 | 73 2d 69 6e 2d 6f 6e 65 |-overlay|s-in-one|
|00001f20| 2d 62 75 66 66 65 72 20 | 41 20 42 20 43 5d 20 39 |-buffer |A B C] 9|
|00001f30| 5d 29 0a 28 64 65 66 61 | 6c 69 61 73 20 27 65 64 |]).(defa|lias 'ed|
|00001f40| 69 66 66 2d 70 72 65 70 | 61 72 65 2d 65 72 72 6f |iff-prep|are-erro|
|00001f50| 72 2d 6c 69 73 74 20 23 | 5b 28 6f 6b 2d 72 65 67 |r-list #|[(ok-reg|
|00001f60| 65 78 70 20 64 69 66 66 | 2d 62 75 66 66 29 20 22 |exp diff|-buff) "|
|00001f70| 08 ab 8c c1 08 21 ab 87 | c2 c1 08 21 21 ac 87 c3 |.....!..|...!!...|
|00001f80| c4 c5 c6 5c 22 21 10 08 | ab d0 c1 08 21 ab cb c2 |...\"!..|....!...|
|00001f90| c1 08 21 21 ab c4 72 08 | 71 88 c7 20 88 0e 08 ab |..!!..r.|q.. ....|
|00001fa0| 98 c1 0e 08 21 ab 92 c2 | c1 0e 08 21 21 ab 8a 72 |....!...|...!!..r|
|00001fb0| 0e 08 71 88 c9 20 29 aa | 8a 0e 5c 6e cb 61 ae 84 |..q.. ).|..\n.a..|
|00001fc0| cc 0e 0d 21 63 88 65 62 | 88 ce 0e 0f 21 88 0e 10 |...!c.eb|....!...|
|00001fd0| d1 73 ab 84 ce d2 21 88 | 29 aa 8b 0e 5c 6e cb 61 |.s....!.|)...\n.a|
|00001fe0| ac 85 cc 0e 0d 21 88 08 | ab 95 c1 08 21 ab 90 c2 |.....!..|....!...|
|00001ff0| c1 08 21 21 ab 89 72 08 | 71 88 d3 20 29 aa 8a 0e |..!!..r.|q.. )...|
|00002000| 5c 6e cb 61 ae 84 cc 0e | 0d 21 d4 55 3f ad b2 0e |\n.a....|.!.U?...|
|00002010| 15 08 1e 16 1e 17 d8 20 | 88 d9 0e 16 21 88 0e 17 |....... |....!...|
|00002020| 89 1e 1a ab 95 c1 0e 1a | 21 ab 8f c2 c1 0e 1a 21 |........|!......!|
|00002030| 21 ab 87 db c1 0e 1a 21 | 21 88 29 cc dc 0e 08 5c |!......!|!.)....\|
|00002040| 22 2a 87 22 20 5b 65 64 | 69 66 66 2d 65 72 72 6f |"*." [ed|iff-erro|
|00002050| 72 2d 62 75 66 66 65 72 | 20 67 65 74 2d 62 75 66 |r-buffer| get-buf|
|00002060| 66 65 72 20 62 75 66 66 | 65 72 2d 6e 61 6d 65 20 |fer buff|er-name |
|00002070| 67 65 74 2d 62 75 66 66 | 65 72 2d 63 72 65 61 74 |get-buff|er-creat|
|00002080| 65 20 65 64 69 66 66 2d | 75 6e 69 71 75 65 2d 62 |e ediff-|unique-b|
|00002090| 75 66 66 65 72 2d 6e 61 | 6d 65 20 22 2a 65 64 69 |uffer-na|me "*edi|
|000020a0| 66 66 2d 65 72 72 6f 72 | 73 22 20 22 2a 22 20 65 |ff-error|s" "*" e|
|000020b0| 72 61 73 65 2d 62 75 66 | 66 65 72 20 64 69 66 66 |rase-buf|fer diff|
|000020c0| 2d 62 75 66 66 20 62 75 | 66 66 65 72 2d 73 74 72 |-buff bu|ffer-str|
|000020d0| 69 6e 67 20 74 68 69 73 | 2d 63 6f 6d 6d 61 6e 64 |ing this|-command|
|000020e0| 20 65 64 69 66 66 2d 71 | 75 69 74 20 65 72 72 6f | ediff-q|uit erro|
|000020f0| 72 20 65 64 69 66 66 2d | 4b 49 4c 4c 45 44 2d 56 |r ediff-|KILLED-V|
|00002100| 49 54 41 4c 2d 42 55 46 | 46 45 52 20 64 65 6c 65 |ITAL-BUF|FER dele|
|00002110| 74 65 2d 6d 61 74 63 68 | 69 6e 67 2d 6c 69 6e 65 |te-match|ing-line|
|00002120| 73 20 6f 6b 2d 72 65 67 | 65 78 70 20 73 79 73 74 |s ok-reg|exp syst|
|00002130| 65 6d 2d 74 79 70 65 20 | 28 76 61 78 2d 76 6d 73 |em-type |(vax-vms|
|00002140| 20 61 78 70 2d 76 6d 73 | 29 20 22 5e 24 22 20 62 | axp-vms|) "^$" b|
|00002150| 75 66 66 65 72 2d 73 69 | 7a 65 20 30 20 65 64 69 |uffer-si|ze 0 edi|
|00002160| 66 66 2d 63 6f 6e 74 72 | 6f 6c 2d 62 75 66 66 65 |ff-contr|ol-buffe|
|00002170| 72 20 65 72 72 6f 72 2d | 62 75 66 20 63 74 6c 2d |r error-|buf ctl-|
|00002180| 62 75 66 20 65 64 69 66 | 66 2d 73 6b 69 70 2d 75 |buf edif|f-skip-u|
|00002190| 6e 73 75 69 74 61 62 6c | 65 2d 66 72 61 6d 65 73 |nsuitabl|e-frames|
|000021a0| 20 73 77 69 74 63 68 2d | 74 6f 2d 62 75 66 66 65 | switch-|to-buffe|
|000021b0| 72 20 62 75 66 20 6b 69 | 6c 6c 2d 62 75 66 66 65 |r buf ki|ll-buffe|
|000021c0| 72 20 22 45 72 72 6f 72 | 73 20 69 6e 20 64 69 66 |r "Error|s in dif|
|000021d0| 66 20 6f 75 74 70 75 74 | 2e 20 44 69 66 66 20 6f |f output|. Diff o|
|000021e0| 75 74 70 75 74 20 69 73 | 20 69 6e 20 25 53 22 5d |utput is| in %S"]|
|000021f0| 20 35 5d 29 0a 28 64 65 | 66 61 6c 69 61 73 20 27 | 5]).(de|falias '|
|00002200| 65 64 69 66 66 2d 65 78 | 74 72 61 63 74 2d 64 69 |ediff-ex|tract-di|
|00002210| 66 66 73 20 23 5b 28 64 | 69 66 66 2d 62 75 66 66 |ffs #[(d|iff-buff|
|00002220| 65 72 20 77 6f 72 64 2d | 6d 6f 64 65 20 26 6f 70 |er word-|mode &op|
|00002230| 74 69 6f 6e 61 6c 20 62 | 6f 75 6e 64 73 29 20 22 |tional b|ounds) "|
|00002240| 08 09 5c 6e c3 89 89 c4 | 89 89 1d 1e 06 1e 07 1e |..\n....|........|
|00002250| 08 1e 09 1e 5c 6e 1e 0b | 1e 0c 1e 0d 0e 0e ab 83 |....\n..|........|
|00002260| cf aa 81 d0 0e 07 42 16 | 07 0e 11 ab b8 0e 11 40 |......B.|.......@|
|00002270| 1e 12 d3 0e 12 21 ad 8e | 0e 14 ab 86 d5 0e 12 21 |.....!..|.......!|
|00002280| aa 84 d6 0e 12 21 29 16 | 06 0e 11 41 40 1e 12 d3 |.....!).|...A@...|
|00002290| 0e 12 21 ad 8e 0e 14 ab | 86 d5 0e 12 21 aa 84 d6 |..!.....|....!...|
|000022a0| 0e 12 21 29 15 0e 0d ab | a1 d7 0e 0d 21 ab 9b d8 |..!)....|....!...|
|000022b0| d7 0e 0d 21 21 ab 93 72 | 0e 0d 71 88 0e 06 ab 84 |...!!..r|..q.....|
|000022c0| 0e 06 aa 81 65 62 88 29 | aa 8b 0e 19 da 61 ac 85 |....eb.)|.....a..|
|000022d0| db 0e 1c 21 88 0e 0c ab | 9f d7 0e 0c 21 ab 99 d8 |...!....|....!...|
|000022e0| d7 0e 0c 21 21 ab 91 72 | 0e 0c 71 88 0d ab 83 0d |...!!..r|..q.....|
|000022f0| aa 81 65 62 88 29 aa 8b | 0e 19 da 61 ac 85 db 0e |..eb.)..|...a....|
|00002300| 1c 21 88 0e 0b ab b6 d7 | 0e 0b 21 ab b0 d8 d7 0e |.!......|..!.....|
|00002310| 0b 21 21 ab a8 0e 0b ab | 99 d7 0e 0b 21 ab 93 d8 |.!!.....|....!...|
|00002320| d7 0e 0b 21 21 ab 8b 72 | 0e 0b 71 88 65 62 88 29 |...!!..r|..q.eb.)|
|00002330| aa 8b 0e 19 da 61 ac 85 | db 0e 1c 21 88 0e 1d 83 |.....a..|...!....|
|00002340| 5c 5c 03 d7 0e 1d 21 83 | 5c 5c 03 d8 d7 0e 1d 21 |\\....!.|\\.....!|
|00002350| 21 83 5c 5c 03 72 0e 1d | 71 88 65 62 88 de 0e 1f |!.\\.r..|q.eb....|
|00002360| c4 e0 23 83 59 03 e1 c3 | 94 c3 95 7b 21 1e 5c 22 |..#.Y...|...{!.\"|
|00002370| e3 94 e3 95 1e 24 89 1e | 25 ab 89 e1 0e 25 0e 24 |.....$..|%....%.$|
|00002380| 7b 21 aa 82 0e 5c 22 2a | 1e 26 e7 94 e7 95 7b 1e |{!...\"*|.&....{.|
|00002390| 28 e1 e9 94 e9 95 7b 21 | 1e 2a eb 94 eb 95 1e 24 |(.....{!|.*.....$|
|000023a0| 89 1e 25 ab 89 e1 0e 25 | 0e 24 7b 21 aa 82 0e 2a |..%....%|.${!...*|
|000023b0| 2a 1e 2c c4 1e 2d c4 1e | 2e c4 1e 2f c4 1e 30 c4 |*.,..-..|.../..0.|
|000023c0| 1e 31 c4 1e 32 c4 1e 33 | c4 1e 34 0e 28 f5 98 ab |.1..2..3|..4.(...|
|000023d0| 8f 0e 2c 54 16 2c 0e 5c | 22 54 89 16 5c 22 16 26 |..,T.,.\|"T..\".&|
|000023e0| aa 9f 0e 28 f6 98 ab 8f | 0e 26 54 16 26 0e 2a 54 |...(....|.&T.&.*T|
|000023f0| 89 16 2a 16 2c aa 8a 0e | 26 54 16 26 0e 2c 54 16 |..*.,...|&T.&.,T.|
|00002400| 2c 0e 37 f8 61 ab 8a 0e | 2a 16 31 0e 2c 16 32 aa |,.7.a...|*.1.,.2.|
|00002410| 88 0e 5c 22 16 31 0e 26 | 16 32 0e 0e ab ed 0e 07 |..\".1.&|.2......|
|00002420| 0e 0b ab b6 d7 0e 0b 21 | ab b0 d8 d7 0e 0b 21 21 |.......!|......!!|
|00002430| ab a8 f9 0e 5c 22 0e 5c | 6e 5a 0e 26 0e 5c 22 5a |....\".\|nZ.&.\"Z|
|00002440| 0e 2a 0e 09 5a 0e 2c 0e | 2a 5a 0e 31 0e 08 5a 0e |.*..Z.,.|*Z.1..Z.|
|00002450| 32 0e 31 5a c4 89 89 89 | 89 26 0b aa 9e f9 0e 5c |2.1Z....|.&.....\|
|00002460| 22 0e 5c 6e 5a 0e 26 0e | 5c 22 5a 0e 2a 0e 09 5a |".\nZ.&.|\"Z.*..Z|
|00002470| 0e 2c 0e 2a 5a c4 89 89 | 89 89 89 89 26 0b 43 a4 |.,.*Z...|....&.C.|
|00002480| 16 07 0e 26 16 5c 6e 0e | 2c 16 09 0e 32 16 08 82 |...&.\n.|,...2...|
|00002490| 54 03 0e 0d ab ae d7 0e | 0d 21 ab a8 d8 d7 0e 0d |T.......|.!......|
|000024a0| 21 21 ab a0 72 0e 0d 71 | 88 0e 5c 22 0e 5c 6e 5a |!!..r..q|..\".\nZ|
|000024b0| 79 88 60 16 2d 0e 26 0e | 5c 22 5a 79 88 60 16 2e |y.`.-.&.|\"Zy.`..|
|000024c0| 0e 26 16 5c 6e 29 aa 8b | 0e 19 da 61 ac 85 db 0e |.&.\n)..|...a....|
|000024d0| 1c 21 88 0e 0c ab ae d7 | 0e 0c 21 ab a8 d8 d7 0e |.!......|..!.....|
|000024e0| 0c 21 21 ab a0 72 0e 0c | 71 88 0e 2a 0e 09 5a 79 |.!!..r..|q..*..Zy|
|000024f0| 88 60 16 2f 0e 2c 0e 2a | 5a 79 88 60 16 30 0e 2c |.`./.,.*|Zy.`.0.,|
|00002500| 16 09 29 aa 8b 0e 19 da | 61 ac 85 db 0e 1c 21 88 |..).....|a.....!.|
|00002510| 0e 0b ab cb d7 0e 0b 21 | ab c5 d8 d7 0e 0b 21 21 |.......!|......!!|
|00002520| ab bd 0e 0b ab ae d7 0e | 0b 21 ab a8 d8 d7 0e 0b |........|.!......|
|00002530| 21 21 ab a0 72 0e 0b 71 | 88 0e 31 0e 08 5a 79 88 |!!..r..q|..1..Zy.|
|00002540| 60 16 33 0e 32 0e 31 5a | 79 88 60 16 34 0e 32 16 |`.3.2.1Z|y.`.4.2.|
|00002550| 08 29 aa 8b 0e 19 da 61 | ac 85 db 0e 1c 21 88 0e |.).....a|.....!..|
|00002560| 07 0e 0b ab ae d7 0e 0b | 21 ab a8 d8 d7 0e 0b 21 |........|!......!|
|00002570| 21 ab a0 f9 0e 2d 0e 2e | 0e 2f 0e 30 0e 33 0e 34 |!....-..|./.0.3.4|
|00002580| c4 89 0e 37 f8 61 ab 83 | fa aa 81 fb 0e 37 c4 26 |...7.a..|.....7.&|
|00002590| 0b aa 92 f9 0e 2d 0e 2e | 0e 2f 0e 30 c4 89 89 89 |.....-..|./.0....|
|000025a0| 89 89 89 26 0b 43 a4 16 | 07 2e 0d 82 18 01 29 aa |...&.C..|......).|
|000025b0| 8b 0e 19 da 61 ac 85 db | 0e 1c 21 88 0e 07 2e 09 |....a...|..!.....|
|000025c0| 87 22 20 5b 65 64 69 66 | 66 2d 62 75 66 66 65 72 |." [edif|f-buffer|
|000025d0| 2d 41 20 65 64 69 66 66 | 2d 62 75 66 66 65 72 2d |-A ediff|-buffer-|
|000025e0| 42 20 65 64 69 66 66 2d | 62 75 66 66 65 72 2d 43 |B ediff-|buffer-C|
|000025f0| 20 31 20 6e 69 6c 20 73 | 68 69 66 74 2d 42 20 73 | 1 nil s|hift-B s|
|00002600| 68 69 66 74 2d 41 20 64 | 69 66 66 2d 6c 69 73 74 |hift-A d|iff-list|
|00002610| 20 63 2d 70 72 65 76 20 | 62 2d 70 72 65 76 20 61 | c-prev |b-prev a|
|00002620| 2d 70 72 65 76 20 43 2d | 62 75 66 66 65 72 20 42 |-prev C-|buffer B|
|00002630| 2d 62 75 66 66 65 72 20 | 41 2d 62 75 66 66 65 72 |-buffer |A-buffer|
|00002640| 20 77 6f 72 64 2d 6d 6f | 64 65 20 77 6f 72 64 73 | word-mo|de words|
|00002650| 20 70 6f 69 6e 74 73 20 | 62 6f 75 6e 64 73 20 6f | points |bounds o|
|00002660| 76 65 72 6c 20 65 64 69 | 66 66 2d 6f 76 65 72 6c |verl edi|ff-overl|
|00002670| 61 79 70 20 65 64 69 66 | 66 2d 65 6d 61 63 73 2d |ayp edif|f-emacs-|
|00002680| 70 20 6f 76 65 72 6c 61 | 79 2d 73 74 61 72 74 20 |p overla|y-start |
|00002690| 65 78 74 65 6e 74 2d 73 | 74 61 72 74 2d 70 6f 73 |extent-s|tart-pos|
|000026a0| 69 74 69 6f 6e 20 67 65 | 74 2d 62 75 66 66 65 72 |ition ge|t-buffer|
|000026b0| 20 62 75 66 66 65 72 2d | 6e 61 6d 65 20 74 68 69 | buffer-|name thi|
|000026c0| 73 2d 63 6f 6d 6d 61 6e | 64 20 65 64 69 66 66 2d |s-comman|d ediff-|
|000026d0| 71 75 69 74 20 65 72 72 | 6f 72 20 65 64 69 66 66 |quit err|or ediff|
|000026e0| 2d 4b 49 4c 4c 45 44 2d | 56 49 54 41 4c 2d 42 55 |-KILLED-|VITAL-BU|
|000026f0| 46 46 45 52 20 64 69 66 | 66 2d 62 75 66 66 65 72 |FFER dif|f-buffer|
|00002700| 20 72 65 2d 73 65 61 72 | 63 68 2d 66 6f 72 77 61 | re-sear|ch-forwa|
|00002710| 72 64 20 65 64 69 66 66 | 2d 6d 61 74 63 68 2d 64 |rd ediff|-match-d|
|00002720| 69 66 66 2d 6c 69 6e 65 | 20 74 20 73 74 72 69 6e |iff-line| t strin|
|00002730| 67 2d 74 6f 2d 69 6e 74 | 20 61 2d 62 65 67 69 6e |g-to-int| a-begin|
|00002740| 20 33 20 65 20 62 20 61 | 2d 65 6e 64 20 34 20 64 | 3 e b a|-end 4 d|
|00002750| 69 66 66 2d 74 79 70 65 | 20 35 20 62 2d 62 65 67 |iff-type| 5 b-beg|
|00002760| 69 6e 20 37 20 62 2d 65 | 6e 64 20 61 2d 62 65 67 |in 7 b-e|nd a-beg|
|00002770| 69 6e 2d 70 74 20 61 2d | 65 6e 64 2d 70 74 20 62 |in-pt a-|end-pt b|
|00002780| 2d 62 65 67 69 6e 2d 70 | 74 20 62 2d 65 6e 64 2d |-begin-p|t b-end-|
|00002790| 70 74 20 63 2d 62 65 67 | 69 6e 20 63 2d 65 6e 64 |pt c-beg|in c-end|
|000027a0| 20 63 2d 62 65 67 69 6e | 2d 70 74 20 63 2d 65 6e | c-begin|-pt c-en|
|000027b0| 64 2d 70 74 20 22 61 22 | 20 22 64 22 20 65 64 69 |d-pt "a"| "d" edi|
|000027c0| 66 66 2d 64 65 66 61 75 | 6c 74 2d 76 61 72 69 61 |ff-defau|lt-varia|
|000027d0| 6e 74 20 64 65 66 61 75 | 6c 74 2d 42 20 76 65 63 |nt defau|lt-B vec|
|000027e0| 74 6f 72 20 41 20 42 5d | 20 31 34 5d 29 0a 28 64 |tor A B]| 14]).(d|
|000027f0| 65 66 61 6c 69 61 73 20 | 27 65 64 69 66 66 2d 63 |efalias |'ediff-c|
|00002800| 6f 6e 76 65 72 74 2d 64 | 69 66 66 73 2d 74 6f 2d |onvert-d|iffs-to-|
|00002810| 6f 76 65 72 6c 61 79 73 | 20 23 5b 28 64 69 66 66 |overlays| #[(diff|
|00002820| 2d 6c 69 73 74 29 20 22 | c0 c1 5c 6e 5c 22 88 c0 |-list) "|..\n\"..|
|00002830| c3 5c 6e 5c 22 88 0c ab | 85 c0 c5 5c 6e 5c 22 88 |.\n\"...|...\n\".|
|00002840| 0e 06 ab 85 c0 c7 5c 6e | 5c 22 88 0e 08 ab 89 c9 |......\n|\"......|
|00002850| ca cb 5c 6e 41 5c 22 21 | 16 0c cd ce 21 87 22 20 |..\nA\"!|....!." |
|00002860| 5b 65 64 69 66 66 2d 73 | 65 74 2d 64 69 66 66 2d |[ediff-s|et-diff-|
|00002870| 6f 76 65 72 6c 61 79 73 | 2d 69 6e 2d 6f 6e 65 2d |overlays|-in-one-|
|00002880| 62 75 66 66 65 72 20 41 | 20 64 69 66 66 2d 6c 69 |buffer A| diff-li|
|00002890| 73 74 20 42 20 65 64 69 | 66 66 2d 33 77 61 79 2d |st B edi|ff-3way-|
|000028a0| 6a 6f 62 20 43 20 65 64 | 69 66 66 2d 6d 65 72 67 |job C ed|iff-merg|
|000028b0| 65 2d 77 69 74 68 2d 61 | 6e 63 65 73 74 6f 72 2d |e-with-a|ncestor-|
|000028c0| 6a 6f 62 20 41 6e 63 65 | 73 74 6f 72 20 65 64 69 |job Ance|stor edi|
|000028d0| 66 66 2d 6d 65 72 67 65 | 2d 6a 6f 62 20 76 63 6f |ff-merge|-job vco|
|000028e0| 6e 63 61 74 20 6d 61 70 | 63 61 72 20 23 5b 28 65 |ncat map|car #[(e|
|000028f0| 6c 74 29 20 22 08 c1 48 | 08 c2 48 1b 1c c5 0c ad |lt) "..H|..H.....|
|00002900| 84 c6 c7 0c 5c 22 0b 5c | 22 2a 87 22 20 5b 65 6c |....\".\|"*." [el|
|00002910| 74 20 39 20 31 30 20 73 | 74 61 74 65 2d 6f 66 2d |t 9 10 s|tate-of-|
|00002920| 61 6e 63 65 73 74 6f 72 | 20 73 74 61 74 65 2d 6f |ancestor| state-o|
|00002930| 66 2d 6d 65 72 67 65 20 | 76 65 63 74 6f 72 20 66 |f-merge |vector f|
|00002940| 6f 72 6d 61 74 20 22 25 | 53 22 5d 20 34 5d 20 65 |ormat "%|S"] 4] e|
|00002950| 64 69 66 66 2d 73 74 61 | 74 65 2d 6f 66 2d 6d 65 |diff-sta|te-of-me|
|00002960| 72 67 65 20 6d 65 73 73 | 61 67 65 20 22 50 72 6f |rge mess|age "Pro|
|00002970| 63 65 73 73 69 6e 67 20 | 64 69 66 66 65 72 65 6e |cessing |differen|
|00002980| 63 65 20 72 65 67 69 6f | 6e 73 20 2e 2e 2e 20 64 |ce regio|ns ... d|
|00002990| 6f 6e 65 22 5d 20 34 5d | 29 0a 28 64 65 66 61 6c |one"] 4]|).(defal|
|000029a0| 69 61 73 20 27 65 64 69 | 66 66 2d 73 65 74 2d 64 |ias 'edi|ff-set-d|
|000029b0| 69 66 66 2d 6f 76 65 72 | 6c 61 79 73 2d 69 6e 2d |iff-over|lays-in-|
|000029c0| 6f 6e 65 2d 62 75 66 66 | 65 72 20 23 5b 28 62 75 |one-buff|er #[(bu|
|000029d0| 66 2d 74 79 70 65 20 64 | 69 66 66 2d 6c 69 73 74 |f-type d|iff-list|
|000029e0| 29 20 22 c0 19 5c 6e c3 | 61 ab 83 0c aa 99 5c 6e |) "..\n.|a.....\n|
|000029f0| c5 61 ab 84 0e 06 aa 90 | 5c 6e c7 61 ab 84 0e 08 |.a......|\n.a....|
|00002a00| aa 87 5c 6e c9 61 ad 82 | 0e 5c 6e 1e 0b 0e 0c 40 |..\n.a..|.\n....@|
|00002a10| 1e 0d 5c 6e c3 61 ab 85 | 0e 0e 40 aa 94 5c 6e c5 |..\n.a..|..@..\n.|
|00002a20| 61 ab 86 0e 0e 41 40 aa | 89 5c 6e c7 61 ad 84 cf |a....A@.|.\n.a...|
|00002a30| 0e 0e 38 1e 10 d1 0e 10 | 21 ad 8e 0e 12 ab 86 d3 |..8.....|!.......|
|00002a40| 0e 10 21 aa 84 d4 0e 10 | 21 29 1e 15 5c 6e c3 61 |..!.....|!)..\n.a|
|00002a50| ab 85 0e 0e 40 aa 94 5c | 6e c5 61 ab 86 0e 0e 41 |....@..\|n.a....A|
|00002a60| 40 aa 89 5c 6e c7 61 ad | 84 cf 0e 0e 38 1e 10 d1 |@..\n.a.|....8...|
|00002a70| 0e 10 21 ad 8e 0e 12 ab | 86 d6 0e 10 21 aa 84 d7 |..!.....|....!...|
|00002a80| 0e 10 21 29 1e 18 d9 1e | 1a d9 1e 1b d9 1e 1c d9 |..!)....|........|
|00002a90| 1e 1d d9 1e 1e d9 1e 1f | d9 1e 20 d9 1e 21 0e 0c |........|.. ..!..|
|00002aa0| 41 89 16 0c 47 16 1c 0e | 0b ab 9a e2 0e 0b 21 ab |A...G...|......!.|
|00002ab0| 94 e3 e2 0e 0b 21 21 ab | 8c 72 0e 0b 71 88 0e 15 |.....!!.|.r..q...|
|00002ac0| 16 1f 29 aa 8b 0e 24 e5 | 61 ac 85 e6 0e 27 21 88 |..)...$.|a....'!.|
|00002ad0| 0e 0c 83 4f 02 09 54 11 | 0e 0c 40 89 16 1b 5c 6e |...O..T.|..@...\n|
|00002ae0| c3 61 ab 83 e8 aa 91 5c | 6e c5 61 ab 83 cf aa 89 |.a.....\|n.a.....|
|00002af0| 5c 6e c7 61 ab 83 e9 aa | 81 ea 48 16 1d 0e 1b 5c |\n.a....|..H....\|
|00002b00| 6e c3 61 ab 83 eb aa 91 | 5c 6e c5 61 ab 83 ec aa |n.a.....|\n.a....|
|00002b10| 89 5c 6e c7 61 ab 83 ed | aa 81 ee 48 16 1e 0e 1b |.\n.a...|...H....|
|00002b20| ef 48 16 21 5c 6e 0e 21 | 61 ac a2 5c 6e c9 61 ac |.H.!\n.!|a..\n.a.|
|00002b30| 9d 0e 21 f0 73 ab 97 f1 | 5c 6e f1 0e 21 c3 c5 c7 |..!.s...|\n..!...|
|00002b40| 45 5c 22 5c 22 40 16 21 | f2 f3 0e 21 5c 22 16 21 |E\"\"@.!|...!\".!|
|00002b50| aa 83 d9 16 21 0e 0d f4 | 61 ab f7 0e 0b ab 9a e2 |....!...|a.......|
|00002b60| 0e 0b 21 ab 94 e3 e2 0e | 0b 21 21 ab 8c 72 0e 0b |..!.....|.!!..r..|
|00002b70| 71 88 0e 1f 62 88 29 aa | 8b 0e 24 e5 61 ac 85 e6 |q...b.).|..$.a...|
|00002b80| 0e 27 21 88 f5 0e 1d 54 | 0e 0b 5c 22 16 1d f5 0e |.'!....T|..\"....|
|00002b90| 1e 0e 0b de 23 89 16 1e | 0e 18 56 ab 84 0e 18 16 |....#...|..V.....|
|00002ba0| 1e 0e 1d 0e 1e 56 ab 84 | 0e 1e 16 1d 0e 0b ab 97 |.....V..|........|
|00002bb0| e2 0e 0b 21 ab 91 e3 e2 | 0e 0b 21 21 ab 89 72 0e |...!....|..!!..r.|
|00002bc0| 0b 71 88 60 29 aa 8a 0e | 24 e5 61 ae 84 e6 0e 27 |.q.`)...|$.a....'|
|00002bd0| 21 16 1f f6 0e 1d 0e 1e | 0e 0b 23 16 20 f7 0e 20 |!.......|..#. .. |
|00002be0| f8 0e 39 23 88 f7 0e 20 | fa 09 23 88 fb 20 ab a9 |..9#... |..#.. ..|
|00002bf0| 0e 3c ab a5 0e 3d ab a1 | fe 0e 20 5c 6e 09 1e 3f |.<...=..|.. \n..?|
|00002c00| 1a 81 40 00 5c 6e 81 41 | 00 0e 3f eb 5c 22 eb 61 |..@.\n.A|..?.\".a|
|00002c10| ab 84 0e 42 aa 82 0e 43 | 5c 22 2a 5c 22 88 81 44 |...B...C|\"*\"..D|
|00002c20| 00 09 81 45 00 5c 22 e8 | 55 ab 8c 81 46 00 81 47 |...E.\".|U...F..G|
|00002c30| 00 5c 6e 09 0e 1c 24 88 | 0e 1a 81 48 00 0e 20 d9 |.\n...$.|...H.. .|
|00002c40| 89 0e 21 24 43 a4 16 1a | 0e 0c 41 89 16 0c 84 e7 |..!$C...|..A.....|
|00002c50| 00 5c 6e 0e 49 1e 4a 1a | 81 4b 00 5c 6e 0e 4a 5c |.\n.I.J.|.K.\n.J\|
|00002c60| 22 41 2a 81 4c 00 0e 1a | 21 4c 2e 0d 87 22 20 5b |"A*.L...|!L..." [|
|00002c70| 2d 31 20 63 75 72 72 65 | 6e 74 2d 64 69 66 66 20 |-1 curre|nt-diff |
|00002c80| 62 75 66 2d 74 79 70 65 | 20 41 20 65 64 69 66 66 |buf-type| A ediff|
|00002c90| 2d 62 75 66 66 65 72 2d | 41 20 42 20 65 64 69 66 |-buffer-|A B edif|
|00002ca0| 66 2d 62 75 66 66 65 72 | 2d 42 20 43 20 65 64 69 |f-buffer|-B C edi|
|00002cb0| 66 66 2d 62 75 66 66 65 | 72 2d 43 20 41 6e 63 65 |ff-buffe|r-C Ance|
|00002cc0| 73 74 6f 72 20 65 64 69 | 66 66 2d 61 6e 63 65 73 |stor edi|ff-ances|
|00002cd0| 74 6f 72 2d 62 75 66 66 | 65 72 20 62 75 66 66 20 |tor-buff|er buff |
|00002ce0| 64 69 66 66 2d 6c 69 73 | 74 20 64 69 66 66 2d 6c |diff-lis|t diff-l|
|00002cf0| 69 73 74 2d 74 79 70 65 | 20 65 64 69 66 66 2d 6e |ist-type| ediff-n|
|00002d00| 61 72 72 6f 77 2d 62 6f | 75 6e 64 73 20 32 20 6f |arrow-bo|unds 2 o|
|00002d10| 76 65 72 6c 20 65 64 69 | 66 66 2d 6f 76 65 72 6c |verl edi|ff-overl|
|00002d20| 61 79 70 20 65 64 69 66 | 66 2d 65 6d 61 63 73 2d |ayp edif|f-emacs-|
|00002d30| 70 20 6f 76 65 72 6c 61 | 79 2d 73 74 61 72 74 20 |p overla|y-start |
|00002d40| 65 78 74 65 6e 74 2d 73 | 74 61 72 74 2d 70 6f 73 |extent-s|tart-pos|
|00002d50| 69 74 69 6f 6e 20 73 68 | 69 66 74 20 6f 76 65 72 |ition sh|ift over|
|00002d60| 6c 61 79 2d 65 6e 64 20 | 65 78 74 65 6e 74 2d 65 |lay-end |extent-e|
|00002d70| 6e 64 2d 70 6f 73 69 74 | 69 6f 6e 20 6c 69 6d 69 |nd-posit|ion limi|
|00002d80| 74 20 6e 69 6c 20 64 69 | 66 66 2d 6f 76 65 72 6c |t nil di|ff-overl|
|00002d90| 61 79 2d 6c 69 73 74 20 | 6c 69 73 74 2d 65 6c 65 |ay-list |list-ele|
|00002da0| 6d 65 6e 74 20 74 6f 74 | 61 6c 2d 64 69 66 66 73 |ment tot|al-diffs|
|00002db0| 20 62 65 67 69 6e 20 65 | 6e 64 20 70 74 2d 73 61 | begin e|nd pt-sa|
|00002dc0| 76 65 64 20 6f 76 65 72 | 6c 61 79 20 73 74 61 74 |ved over|lay stat|
|00002dd0| 65 2d 6f 66 2d 64 69 66 | 66 20 67 65 74 2d 62 75 |e-of-dif|f get-bu|
|00002de0| 66 66 65 72 20 62 75 66 | 66 65 72 2d 6e 61 6d 65 |ffer buf|fer-name|
|00002df0| 20 74 68 69 73 2d 63 6f | 6d 6d 61 6e 64 20 65 64 | this-co|mmand ed|
|00002e00| 69 66 66 2d 71 75 69 74 | 20 65 72 72 6f 72 20 65 |iff-quit| error e|
|00002e10| 64 69 66 66 2d 4b 49 4c | 4c 45 44 2d 56 49 54 41 |diff-KIL|LED-VITA|
|00002e20| 4c 2d 42 55 46 46 45 52 | 20 30 20 34 20 36 20 31 |L-BUFFER| 0 4 6 1|
|00002e30| 20 33 20 35 20 37 20 38 | 20 28 41 20 42 20 43 29 | 3 5 7 8| (A B C)|
|00002e40| 20 64 65 6c 71 20 66 6f | 72 6d 61 74 20 22 3d 64 | delq fo|rmat "=d|
|00002e50| 69 66 66 28 25 53 29 22 | 20 77 6f 72 64 73 20 65 |iff(%S)"| words e|
|00002e60| 64 69 66 66 2d 67 6f 74 | 6f 2d 77 6f 72 64 20 65 |diff-got|o-word e|
|00002e70| 64 69 66 66 2d 6d 61 6b | 65 2d 62 75 6c 6c 65 74 |diff-mak|e-bullet|
|00002e80| 2d 70 72 6f 6f 66 2d 6f | 76 65 72 6c 61 79 20 65 |-proof-o|verlay e|
|00002e90| 64 69 66 66 2d 6f 76 65 | 72 6c 61 79 2d 70 75 74 |diff-ove|rlay-put|
|00002ea0| 20 70 72 69 6f 72 69 74 | 79 20 65 64 69 66 66 2d | priorit|y ediff-|
|00002eb0| 73 68 61 64 6f 77 2d 6f | 76 65 72 6c 61 79 2d 70 |shadow-o|verlay-p|
|00002ec0| 72 69 6f 72 69 74 79 20 | 65 64 69 66 66 2d 64 69 |riority |ediff-di|
|00002ed0| 66 66 2d 6e 75 6d 20 65 | 64 69 66 66 2d 68 61 73 |ff-num e|diff-has|
|00002ee0| 2d 66 61 63 65 2d 73 75 | 70 70 6f 72 74 2d 70 20 |-face-su|pport-p |
|00002ef0| 65 64 69 66 66 2d 75 73 | 65 2d 66 61 63 65 73 20 |ediff-us|e-faces |
|00002f00| 65 64 69 66 66 2d 68 69 | 67 68 6c 69 67 68 74 2d |ediff-hi|ghlight-|
|00002f10| 61 6c 6c 2d 64 69 66 66 | 73 20 65 64 69 66 66 2d |all-diff|s ediff-|
|00002f20| 73 65 74 2d 6f 76 65 72 | 6c 61 79 2d 66 61 63 65 |set-over|lay-face|
|00002f30| 20 64 69 66 2d 6e 75 6d | 20 65 64 69 66 66 2d 67 | dif-num| ediff-g|
|00002f40| 65 74 2d 73 79 6d 62 6f | 6c 2d 66 72 6f 6d 2d 61 |et-symbo|l-from-a|
|00002f50| 6c 69 73 74 20 6c 6f 67 | 61 6e 64 20 65 64 69 66 |list log|and edif|
|00002f60| 66 2d 65 76 65 6e 2d 64 | 69 66 66 2d 66 61 63 65 |f-even-d|iff-face|
|00002f70| 2d 61 6c 69 73 74 20 65 | 64 69 66 66 2d 6f 64 64 |-alist e|diff-odd|
|00002f80| 2d 64 69 66 66 2d 66 61 | 63 65 2d 61 6c 69 73 74 |-diff-fa|ce-alist|
|00002f90| 20 6d 6f 64 20 31 30 20 | 6d 65 73 73 61 67 65 20 | mod 10 |message |
|00002fa0| 22 42 75 66 66 65 72 20 | 25 53 3a 20 50 72 6f 63 |"Buffer |%S: Proc|
|00002fb0| 65 73 73 69 6e 67 20 64 | 69 66 66 65 72 65 6e 63 |essing d|ifferenc|
|00002fc0| 65 20 72 65 67 69 6f 6e | 20 25 64 20 6f 66 20 25 |e region| %d of %|
|00002fd0| 64 22 20 76 65 63 74 6f | 72 20 65 64 69 66 66 2d |d" vecto|r ediff-|
|00002fe0| 64 69 66 66 65 72 65 6e | 63 65 2d 76 65 63 74 6f |differen|ce-vecto|
|00002ff0| 72 2d 61 6c 69 73 74 20 | 61 6c 69 73 74 20 61 73 |r-alist |alist as|
|00003000| 73 6f 63 20 76 63 6f 6e | 63 61 74 5d 20 38 5d 29 |soc vcon|cat] 8])|
|00003010| 0a 28 64 65 66 61 6c 69 | 61 73 20 27 65 64 69 66 |.(defali|as 'edif|
|00003020| 66 2d 6d 61 6b 65 2d 66 | 69 6e 65 2d 64 69 66 66 |f-make-f|ine-diff|
|00003030| 73 20 23 5b 28 26 6f 70 | 74 69 6f 6e 61 6c 20 6e |s #[(&op|tional n|
|00003040| 20 66 6c 61 67 29 20 22 | 08 ac 82 09 10 5c 6e c3 | flag) "|.....\n.|
|00003050| 57 ab 84 c4 0d 21 88 0e | 06 ab 86 c7 16 08 c9 16 |W....!..|........|
|00003060| 5c 6e 08 cb 57 86 d7 03 | 08 5c 6e 59 86 d7 03 cc |\n..W...|.\nY....|
|00003070| 0e 0d 21 0e 0e 0e 0f 0e | 10 d1 08 d2 5c 22 d1 08 |..!.....|....\"..|
|00003080| d3 5c 22 d1 08 d4 5c 22 | d5 08 d2 5c 22 d5 08 d3 |.\"...\"|...\"...|
|00003090| 5c 22 d5 08 d4 5c 22 d6 | 1e 17 1e 18 1e 19 1e 1a |\"...\".|........|
|000030a0| 1e 1b 1e 1c 1e 1d 1e 1e | 1e 1f 1e 20 1e 21 e2 d6 |........|... .!..|
|000030b0| 0e 1d 0e 1c 0e 1b 45 5c | 22 47 c3 56 83 11 01 e3 |......E\|"G.V....|
|000030c0| 08 21 ab 8a 0e 24 ab 86 | e5 d4 d6 08 23 88 0e 26 |.!...$..|....#..&|
|000030d0| ab ab e7 08 54 0e 1d ac | 83 d2 aa 8d 0e 1c ac 83 |....T...|........|
|000030e0| d3 aa 86 0e 1b 3f ad 81 | d4 44 1e 28 1e 29 0e 2a |.....?..|.D.(.).*|
|000030f0| ab 88 eb ec 0e 29 0e 28 | 23 88 2a aa a8 ed 08 54 |.....).(|#.*....T|
|00003100| 0e 1d ab 83 d2 aa 8c 0e | 1c ab 83 d3 aa 85 0e 1b |........|........|
|00003110| ad 81 d4 44 1e 28 1e 29 | 0e 2a ab 88 eb ec 0e 29 |...D.(.)|.*.....)|
|00003120| 0e 28 23 88 2a 0e 1a ab | a1 0e 19 ab 9d 0e 18 ab |.(#.*...|........|
|00003130| 99 d2 0e 2e 1e 2f 1e 30 | f1 0e 30 0e 2f 5c 22 41 |...../.0|..0./\"A|
|00003140| 2a 4a 08 48 f2 f3 49 88 | 82 d0 03 d2 0e 2e 1e 2f |*J.H..I.|......./|
|00003150| 1e 30 f1 0e 30 0e 2f 5c | 22 41 2a 4a 08 48 f2 d6 |.0..0./\|"A*J.H..|
|00003160| 49 88 82 d0 03 0e 08 f4 | 61 83 a0 01 d2 0e 2e 1e |I.......|a.......|
|00003170| 2f 1e 30 f1 0e 30 0e 2f | 5c 22 41 2a 4a 08 48 c3 |/.0..0./|\"A*J.H.|
|00003180| 48 ab f2 d2 0e 2e 1e 2f | 1e 30 f1 0e 30 0e 2f 5c |H....../|.0..0./\|
|00003190| 22 41 2a 4a 08 48 f2 48 | 83 d0 03 ec f5 08 54 d2 |"A*J.H.H|......T.|
|000031a0| 0e 2e 1e 2f 1e 30 f1 0e | 30 0e 2f 5c 22 41 2a 4a |.../.0..|0./\"A*J|
|000031b0| 08 48 f2 48 d2 61 ab 83 | f6 aa b7 d2 0e 2e 1e 2f |.H.H.a..|......./|
|000031c0| 1e 30 f1 0e 30 0e 2f 5c | 22 41 2a 4a 08 48 f2 48 |.0..0./\|"A*J.H.H|
|000031d0| d3 61 ab 83 f7 aa 9c d2 | 0e 2e 1e 2f 1e 30 f1 0e |.a......|.../.0..|
|000031e0| 30 0e 2f 5c 22 41 2a 4a | 08 48 f2 48 d4 61 ab 83 |0./\"A*J|.H.H.a..|
|000031f0| f8 aa 81 f9 23 88 82 d0 | 03 0e 08 c7 61 ab af fa |....#...|....a...|
|00003200| d2 0e 2e 5c 22 4a 08 48 | c3 48 84 d0 03 0e 5c 6e |...\"J.H|.H....\n|
|00003210| fb 73 84 d0 03 fc 08 54 | fd fe 21 44 1e 28 1e 29 |.s.....T|..!D.(.)|
|00003220| 0e 2a ab 88 eb ec 0e 29 | 0e 28 23 88 2a 82 d0 03 |.*.....)|.(#.*...|
|00003230| ff 81 40 00 d2 81 41 00 | 08 23 81 40 00 d2 81 42 |..@...A.|.#.@...B|
|00003240| 00 08 23 0e 43 0e 21 0e | 44 25 88 81 45 00 0e 21 |..#.C.!.|D%..E..!|
|00003250| 81 46 00 0e 20 23 16 20 | ff 81 40 00 d3 81 41 00 |.F.. #. |..@...A.|
|00003260| 08 23 81 40 00 d3 81 42 | 00 08 23 0e 47 0e 21 0e |.#.@...B|..#.G.!.|
|00003270| 44 25 88 81 45 00 0e 21 | 81 48 00 0e 1f 23 16 1f |D%..E..!|.H...#..|
|00003280| 0e 49 ab a8 ff 81 40 00 | d4 81 41 00 08 23 81 40 |.I....@.|..A..#.@|
|00003290| 00 d4 81 42 00 08 23 0e | 4a 0e 21 0e 44 25 88 81 |...B..#.|J.!.D%..|
|000032a0| 45 00 0e 21 81 4b 00 0e | 1e 23 16 1e 0e 20 16 0e |E..!.K..|.#... ..|
|000032b0| 0e 1f 16 0f 0e 1e 16 10 | 0e 49 ab 91 0e 1a ab 8d |........|.I......|
|000032c0| 81 4c 00 d6 0e 1f 0e 1e | 08 24 88 aa b6 0e 49 ab |.L......|.$....I.|
|000032d0| 91 0e 19 ab 8d 81 4c 00 | 0e 20 d6 0e 1e 08 24 88 |......L.|. ....$.|
|000032e0| aa a1 0e 49 ab 91 0e 18 | ab 8d 81 4c 00 0e 20 0e |...I....|...L.. .|
|000032f0| 1f d6 08 24 88 aa 8c 81 | 4c 00 0e 20 0e 1f 0e 1e |...$....|L.. ....|
|00003300| 08 24 88 d2 0e 2e 1e 2f | 1e 30 f1 0e 30 0e 2f 5c |.$...../|.0..0./\|
|00003310| 22 41 2a 4a 08 48 c3 48 | 47 d3 0e 2e 1e 2f 1e 30 |"A*J.H.H|G..../.0|
|00003320| f1 0e 30 0e 2f 5c 22 41 | 2a 4a 08 48 c3 48 47 5c |..0./\"A|*J.H.HG\|
|00003330| 5c 0e 1e ab 9b 0e 24 ac | 97 d4 0e 2e 1e 2f 1e 30 |\.....$.|...../.0|
|00003340| f1 0e 30 0e 2f 5c 22 41 | 2a 4a 08 48 c3 48 47 aa |..0./\"A|*J.H.HG.|
|00003350| 81 cb 5c 5c 16 17 0e 1a | ab 88 0e 19 ab 84 0e 18 |..\\....|........|
|00003360| ac 96 0e 1a ac c2 0e 19 | ac be 0e 49 ab 84 0e 18 |........|...I....|
|00003370| ac b6 0e 17 cb 61 ab b0 | d2 0e 2e 1e 2f 1e 30 f1 |.....a..|..../.0.|
|00003380| 0e 30 0e 2f 5c 22 41 2a | 4a 08 48 f2 f3 49 88 81 |.0./\"A*|J.H..I..|
|00003390| 4d 00 08 54 43 1e 28 1e | 29 0e 2a ab 88 eb ec 0e |M..TC.(.|).*.....|
|000033a0| 29 0e 28 23 88 2a 82 d0 | 03 0e 17 cb 61 ab ec f5 |).(#.*..|....a...|
|000033b0| 08 54 0e 1a ab 99 d2 0e | 2e 1e 2f 1e 30 f1 0e 30 |.T......|../.0..0|
|000033c0| 0e 2f 5c 22 41 2a 4a 08 | 48 f2 d2 49 88 f6 aa b8 |./\"A*J.|H..I....|
|000033d0| 0e 19 ab 99 d2 0e 2e 1e | 2f 1e 30 f1 0e 30 0e 2f |........|/.0..0./|
|000033e0| 5c 22 41 2a 4a 08 48 f2 | d3 49 88 f7 aa 9b 0e 18 |\"A*J.H.|.I......|
|000033f0| ad 97 d2 0e 2e 1e 2f 1e | 30 f1 0e 30 0e 2f 5c 22 |....../.|0..0./\"|
|00003400| 41 2a 4a 08 48 f2 d4 49 | 88 f8 44 1e 28 1e 29 0e |A*J.H..I|..D.(.).|
|00003410| 2a ab 88 eb ec 0e 29 0e | 28 23 88 2a aa 96 d2 0e |*.....).|(#.*....|
|00003420| 2e 1e 2f 1e 30 f1 0e 30 | 0e 2f 5c 22 41 2a 4a 08 |../.0..0|./\"A*J.|
|00003430| 48 f2 d6 49 88 81 4e 00 | 08 21 2e 0b 87 22 20 5b |H..I..N.|.!..." [|
|00003440| 6e 20 65 64 69 66 66 2d | 63 75 72 72 65 6e 74 2d |n ediff-|current-|
|00003450| 64 69 66 66 65 72 65 6e | 63 65 20 65 64 69 66 66 |differen|ce ediff|
|00003460| 2d 6e 75 6d 62 65 72 2d | 6f 66 2d 64 69 66 66 65 |-number-|of-diffe|
|00003470| 72 65 6e 63 65 73 20 31 | 20 65 72 72 6f 72 20 65 |rences 1| error e|
|00003480| 64 69 66 66 2d 4e 4f 2d | 44 49 46 46 45 52 45 4e |diff-NO-|DIFFEREN|
|00003490| 43 45 53 20 65 64 69 66 | 66 2d 77 6f 72 64 2d 6d |CES edif|f-word-m|
|000034a0| 6f 64 65 20 73 6b 69 70 | 20 66 6c 61 67 20 6e 69 |ode skip| flag ni|
|000034b0| 78 20 65 64 69 66 66 2d | 61 75 74 6f 2d 72 65 66 |x ediff-|auto-ref|
|000034c0| 69 6e 65 20 30 20 67 65 | 74 2d 62 75 66 66 65 72 |ine 0 ge|t-buffer|
|000034d0| 2d 63 72 65 61 74 65 20 | 65 64 69 66 66 2d 74 6d |-create |ediff-tm|
|000034e0| 70 2d 62 75 66 66 65 72 | 20 65 64 69 66 66 2d 74 |p-buffer| ediff-t|
|000034f0| 65 6d 70 2d 66 69 6c 65 | 2d 41 20 65 64 69 66 66 |emp-file|-A ediff|
|00003500| 2d 74 65 6d 70 2d 66 69 | 6c 65 2d 42 20 65 64 69 |-temp-fi|le-B edi|
|00003510| 66 66 2d 74 65 6d 70 2d | 66 69 6c 65 2d 43 20 65 |ff-temp-|file-C e|
|00003520| 64 69 66 66 2d 65 6d 70 | 74 79 2d 64 69 66 66 2d |diff-emp|ty-diff-|
|00003530| 72 65 67 69 6f 6e 2d 70 | 20 41 20 42 20 43 20 65 |region-p| A B C e|
|00003540| 64 69 66 66 2d 77 68 69 | 74 65 73 70 61 63 65 2d |diff-whi|tespace-|
|00003550| 64 69 66 66 2d 72 65 67 | 69 6f 6e 2d 70 20 6e 69 |diff-reg|ion-p ni|
|00003560| 6c 20 63 75 6d 75 6c 61 | 74 69 76 65 2d 66 69 6e |l cumula|tive-fin|
|00003570| 65 2d 64 69 66 66 2d 6c | 65 6e 67 74 68 20 77 68 |e-diff-l|ength wh|
|00003580| 69 74 65 73 70 61 63 65 | 2d 43 20 77 68 69 74 65 |itespace|-C white|
|00003590| 73 70 61 63 65 2d 42 20 | 77 68 69 74 65 73 70 61 |space-B |whitespa|
|000035a0| 63 65 2d 41 20 65 6d 70 | 74 79 2d 43 20 65 6d 70 |ce-A emp|ty-C emp|
|000035b0| 74 79 2d 42 20 65 6d 70 | 74 79 2d 41 20 66 69 6c |ty-B emp|ty-A fil|
|000035c0| 65 2d 43 20 66 69 6c 65 | 2d 42 20 66 69 6c 65 2d |e-C file|-B file-|
|000035d0| 41 20 74 6d 70 2d 62 75 | 66 66 65 72 20 64 65 6c |A tmp-bu|ffer del|
|000035e0| 71 20 65 64 69 66 66 2d | 6c 6f 6f 6b 73 2d 6c 69 |q ediff-|looks-li|
|000035f0| 6b 65 2d 63 6f 6d 62 69 | 6e 65 64 2d 6d 65 72 67 |ke-combi|ned-merg|
|00003600| 65 20 65 64 69 66 66 2d | 6d 65 72 67 65 2d 6a 6f |e ediff-|merge-jo|
|00003610| 62 20 65 64 69 66 66 2d | 73 65 74 2d 66 69 6e 65 |b ediff-|set-fine|
|00003620| 2d 6f 76 65 72 6c 61 79 | 73 2d 69 6e 2d 6f 6e 65 |-overlay|s-in-one|
|00003630| 2d 62 75 66 66 65 72 20 | 65 64 69 66 66 2d 33 77 |-buffer |ediff-3w|
|00003640| 61 79 2d 63 6f 6d 70 61 | 72 69 73 6f 6e 2d 6a 6f |ay-compa|rison-jo|
|00003650| 62 20 22 52 65 67 69 6f | 6e 20 25 64 20 69 73 20 |b "Regio|n %d is |
|00003660| 65 6d 70 74 79 20 69 6e | 20 61 6c 6c 20 62 75 66 |empty in| all buf|
|00003670| 66 65 72 73 20 62 75 74 | 20 25 53 22 20 61 72 67 |fers but| %S" arg|
|00003680| 73 20 73 74 72 69 6e 67 | 20 65 64 69 66 66 2d 76 |s string| ediff-v|
|00003690| 65 72 62 6f 73 65 2d 70 | 20 61 70 70 6c 79 20 6d |erbose-p| apply m|
|000036a0| 65 73 73 61 67 65 20 22 | 52 65 67 69 6f 6e 20 25 |essage "|Region %|
|000036b0| 64 20 69 6e 20 62 75 66 | 66 65 72 20 25 53 20 69 |d in buf|fer %S i|
|000036c0| 73 20 65 6d 70 74 79 22 | 20 65 64 69 66 66 2d 64 |s empty"| ediff-d|
|000036d0| 69 66 66 65 72 65 6e 63 | 65 2d 76 65 63 74 6f 72 |ifferenc|e-vector|
|000036e0| 2d 61 6c 69 73 74 20 61 | 6c 69 73 74 20 62 75 66 |-alist a|list buf|
|000036f0| 2d 74 79 70 65 20 61 73 | 73 6f 63 20 32 20 74 20 |-type as|soc 2 t |
|00003700| 6e 6f 66 6f 72 63 65 20 | 22 4f 6e 6c 79 20 77 68 |noforce |"Only wh|
|00003710| 69 74 65 2d 73 70 61 63 | 65 20 64 69 66 66 65 72 |ite-spac|e differ|
|00003720| 65 6e 63 65 73 20 69 6e | 20 72 65 67 69 6f 6e 20 |ences in| region |
|00003730| 25 64 20 25 73 22 20 22 | 69 6e 20 62 75 66 66 65 |%d %s" "|in buffe|
|00003740| 72 73 20 42 20 26 20 43 | 22 20 22 69 6e 20 62 75 |rs B & C|" "in bu|
|00003750| 66 66 65 72 73 20 41 20 | 26 20 43 22 20 22 69 6e |ffers A |& C" "in|
|00003760| 20 62 75 66 66 65 72 73 | 20 41 20 26 20 42 22 20 | buffers| A & B" |
|00003770| 22 22 20 65 64 69 66 66 | 2d 67 65 74 2d 73 79 6d |"" ediff|-get-sym|
|00003780| 62 6f 6c 2d 66 72 6f 6d | 2d 61 6c 69 73 74 20 28 |bol-from|-alist (|
|00003790| 6f 66 66 20 6e 69 78 29 | 20 22 52 65 67 69 6f 6e |off nix)| "Region|
|000037a0| 20 25 64 20 65 78 63 65 | 65 64 73 20 61 75 74 6f | %d exce|eds auto|
|000037b0| 2d 72 65 66 69 6e 65 20 | 6c 69 6d 69 74 2e 20 54 |-refine |limit. T|
|000037c0| 79 70 65 20 60 25 73 27 | 20 74 6f 20 72 65 66 69 |ype `%s'| to refi|
|000037d0| 6e 65 22 20 73 75 62 73 | 74 69 74 75 74 65 2d 63 |ne" subs|titute-c|
|000037e0| 6f 6d 6d 61 6e 64 2d 6b | 65 79 73 20 22 5c 5c 5b |ommand-k|eys "\\[|
|000037f0| 65 64 69 66 66 2d 6d 61 | 6b 65 2d 6f 72 2d 6b 69 |ediff-ma|ke-or-ki|
|00003800| 6c 6c 2d 66 69 6e 65 2d | 64 69 66 66 73 5d 22 20 |ll-fine-|diffs]" |
|00003810| 65 64 69 66 66 2d 77 6f | 72 64 69 66 79 20 65 64 |ediff-wo|rdify ed|
|00003820| 69 66 66 2d 67 65 74 2d | 64 69 66 66 2d 70 6f 73 |iff-get-|diff-pos|
|00003830| 6e 20 62 65 67 20 65 6e | 64 20 65 64 69 66 66 2d |n beg en|d ediff-|
|00003840| 62 75 66 66 65 72 2d 41 | 20 65 64 69 66 66 2d 63 |buffer-A| ediff-c|
|00003850| 6f 6e 74 72 6f 6c 2d 62 | 75 66 66 65 72 20 65 64 |ontrol-b|uffer ed|
|00003860| 69 66 66 2d 6d 61 6b 65 | 2d 74 65 6d 70 2d 66 69 |iff-make|-temp-fi|
|00003870| 6c 65 20 22 66 69 6e 65 | 44 69 66 66 41 22 20 65 |le "fine|DiffA" e|
|00003880| 64 69 66 66 2d 62 75 66 | 66 65 72 2d 42 20 22 66 |diff-buf|fer-B "f|
|00003890| 69 6e 65 44 69 66 66 42 | 22 20 65 64 69 66 66 2d |ineDiffB|" ediff-|
|000038a0| 33 77 61 79 2d 6a 6f 62 | 20 65 64 69 66 66 2d 62 |3way-job| ediff-b|
|000038b0| 75 66 66 65 72 2d 43 20 | 22 66 69 6e 65 44 69 66 |uffer-C |"fineDif|
|000038c0| 66 43 22 20 65 64 69 66 | 66 2d 73 65 74 75 70 2d |fC" edif|f-setup-|
|000038d0| 66 69 6e 65 2d 64 69 66 | 66 2d 72 65 67 69 6f 6e |fine-dif|f-region|
|000038e0| 73 20 22 4f 6e 6c 79 20 | 77 68 69 74 65 2d 73 70 |s "Only |white-sp|
|000038f0| 61 63 65 20 64 69 66 66 | 65 72 65 6e 63 65 73 20 |ace diff|erences |
|00003900| 69 6e 20 72 65 67 69 6f | 6e 20 25 64 22 20 65 64 |in regio|n %d" ed|
|00003910| 69 66 66 2d 73 65 74 2d | 66 69 6e 65 2d 64 69 66 |iff-set-|fine-dif|
|00003920| 66 2d 70 72 6f 70 65 72 | 74 69 65 73 5d 20 31 32 |f-proper|ties] 12|
|00003930| 5d 29 0a 28 64 65 66 61 | 6c 69 61 73 20 27 65 64 |]).(defa|lias 'ed|
|00003940| 69 66 66 2d 69 6e 73 74 | 61 6c 6c 2d 66 69 6e 65 |iff-inst|all-fine|
|00003950| 2d 64 69 66 66 2d 69 66 | 2d 6e 65 63 65 73 73 61 |-diff-if|-necessa|
|00003960| 72 79 20 23 5b 28 6e 29 | 20 22 08 c1 61 ab ae 5c |ry #[(n)| "..a..\|
|00003970| 6e c3 c4 c5 0e 06 23 c3 | c4 c7 0e 06 23 5a 56 ab |n.....#.|....#ZV.|
|00003980| 97 5c 6e c3 c8 c5 0e 06 | 23 c3 c8 c7 0e 06 23 5a |.\n.....|#.....#Z|
|00003990| 56 ab 86 c9 0e 06 ca 5c | 22 87 c9 0e 06 cb 5c 22 |V......\|".....\"|
|000039a0| 87 08 cc 61 ad 85 c9 0e | 06 cb 5c 22 87 22 20 5b |...a....|..\"." [|
|000039b0| 65 64 69 66 66 2d 61 75 | 74 6f 2d 72 65 66 69 6e |ediff-au|to-refin|
|000039c0| 65 20 6f 6e 20 65 64 69 | 66 66 2d 61 75 74 6f 2d |e on edi|ff-auto-|
|000039d0| 72 65 66 69 6e 65 2d 6c | 69 6d 69 74 20 65 64 69 |refine-l|imit edi|
|000039e0| 66 66 2d 67 65 74 2d 64 | 69 66 66 2d 70 6f 73 6e |ff-get-d|iff-posn|
|000039f0| 20 41 20 65 6e 64 20 6e | 20 62 65 67 20 42 20 65 | A end n| beg B e|
|00003a00| 64 69 66 66 2d 6d 61 6b | 65 2d 66 69 6e 65 2d 64 |diff-mak|e-fine-d|
|00003a10| 69 66 66 73 20 6e 6f 66 | 6f 72 63 65 20 73 6b 69 |iffs nof|orce ski|
|00003a20| 70 20 6f 66 66 5d 20 36 | 5d 29 0a 28 64 65 66 61 |p off] 6|]).(defa|
|00003a30| 6c 69 61 73 20 27 65 64 | 69 66 66 2d 73 65 74 2d |lias 'ed|iff-set-|
|00003a40| 66 69 6e 65 2d 64 69 66 | 66 2d 70 72 6f 70 65 72 |fine-dif|f-proper|
|00003a50| 74 69 65 73 20 23 5b 28 | 6e 20 26 6f 70 74 69 6f |ties #[(|n &optio|
|00003a60| 6e 61 6c 20 64 65 66 61 | 75 6c 74 29 20 22 c0 20 |nal defa|ult) ". |
|00003a70| 3f ae a2 09 c2 57 ae 9d | 09 0b 59 ae 98 c4 c5 09 |?....W..|..Y.....|
|00003a80| 0e 06 23 88 c4 c7 09 0e | 06 23 88 0e 08 ad 86 c4 |..#.....|.#......|
|00003a90| c9 09 0e 06 23 87 22 20 | 5b 65 64 69 66 66 2d 68 |....#." |[ediff-h|
|00003aa0| 61 73 2d 66 61 63 65 2d | 73 75 70 70 6f 72 74 2d |as-face-|support-|
|00003ab0| 70 20 6e 20 30 20 65 64 | 69 66 66 2d 6e 75 6d 62 |p n 0 ed|iff-numb|
|00003ac0| 65 72 2d 6f 66 2d 64 69 | 66 66 65 72 65 6e 63 65 |er-of-di|fference|
|00003ad0| 73 20 65 64 69 66 66 2d | 73 65 74 2d 66 69 6e 65 |s ediff-|set-fine|
|00003ae0| 2d 64 69 66 66 2d 70 72 | 6f 70 65 72 74 69 65 73 |-diff-pr|operties|
|00003af0| 2d 69 6e 2d 6f 6e 65 2d | 62 75 66 66 65 72 20 41 |-in-one-|buffer A|
|00003b00| 20 64 65 66 61 75 6c 74 | 20 42 20 65 64 69 66 66 | default| B ediff|
|00003b10| 2d 33 77 61 79 2d 6a 6f | 62 20 43 5d 20 34 5d 29 |-3way-jo|b C] 4])|
|00003b20| 0a 28 64 65 66 61 6c 69 | 61 73 20 27 65 64 69 66 |.(defali|as 'edif|
|00003b30| 66 2d 73 65 74 2d 66 69 | 6e 65 2d 64 69 66 66 2d |f-set-fi|ne-diff-|
|00003b40| 70 72 6f 70 65 72 74 69 | 65 73 2d 69 6e 2d 6f 6e |properti|es-in-on|
|00003b50| 65 2d 62 75 66 66 65 72 | 20 23 5b 28 62 75 66 2d |e-buffer| #[(buf-|
|00003b60| 74 79 70 65 20 6e 20 26 | 6f 70 74 69 6f 6e 61 6c |type n &|optional|
|00003b70| 20 64 65 66 61 75 6c 74 | 29 20 22 08 09 1a 18 c3 | default|) ".....|
|00003b80| 08 5c 6e 5c 22 41 2a 4a | 0c 48 c5 48 0e 06 ab 83 |.\n\"A*J|.H.H....|
|00003b90| c6 aa 8d c7 08 0e 08 1a | 18 c3 08 5c 6e 5c 22 41 |........|...\n\"A|
|00003ba0| 2a 21 0e 06 ab 83 c9 aa | 93 ca 08 0e 0b 1a 18 c3 |*!......|........|
|00003bb0| 08 5c 6e 5c 22 41 2a 4a | cc 5c 22 ae 81 c9 54 1e |.\n\"A*J|.\"...T.|
|00003bc0| 0c 1e 0d 1e 0e cf d0 0e | 0e 5c 22 2b 87 22 20 5b |........|.\"+." [|
|00003bd0| 62 75 66 2d 74 79 70 65 | 20 65 64 69 66 66 2d 64 |buf-type| ediff-d|
|00003be0| 69 66 66 65 72 65 6e 63 | 65 2d 76 65 63 74 6f 72 |ifferenc|e-vector|
|00003bf0| 2d 61 6c 69 73 74 20 61 | 6c 69 73 74 20 61 73 73 |-alist a|list ass|
|00003c00| 6f 63 20 6e 20 31 20 64 | 65 66 61 75 6c 74 20 66 |oc n 1 d|efault f|
|00003c10| 61 63 65 2d 6e 61 6d 65 | 20 65 64 69 66 66 2d 66 |ace-name| ediff-f|
|00003c20| 69 6e 65 2d 64 69 66 66 | 2d 66 61 63 65 2d 61 6c |ine-diff|-face-al|
|00003c30| 69 73 74 20 30 20 65 64 | 69 66 66 2d 6f 76 65 72 |ist 0 ed|iff-over|
|00003c40| 6c 61 79 2d 67 65 74 20 | 65 64 69 66 66 2d 63 75 |lay-get |ediff-cu|
|00003c50| 72 72 65 6e 74 2d 64 69 | 66 66 2d 6f 76 65 72 6c |rrent-di|ff-overl|
|00003c60| 61 79 2d 61 6c 69 73 74 | 20 70 72 69 6f 72 69 74 |ay-alist| priorit|
|00003c70| 79 20 66 61 63 65 20 66 | 69 6e 65 2d 64 69 66 66 |y face f|ine-diff|
|00003c80| 2d 76 65 63 74 6f 72 20 | 6d 61 70 63 61 72 20 23 |-vector |mapcar #|
|00003c90| 5b 28 6f 76 65 72 6c 29 | 20 22 c0 09 5c 6e 5c 22 |[(overl)| "..\n\"|
|00003ca0| 88 c3 09 c4 0c 23 87 22 | 20 5b 65 64 69 66 66 2d |.....#."| [ediff-|
|00003cb0| 73 65 74 2d 6f 76 65 72 | 6c 61 79 2d 66 61 63 65 |set-over|lay-face|
|00003cc0| 20 6f 76 65 72 6c 20 66 | 61 63 65 20 65 64 69 66 | overl f|ace edif|
|00003cd0| 66 2d 6f 76 65 72 6c 61 | 79 2d 70 75 74 20 70 72 |f-overla|y-put pr|
|00003ce0| 69 6f 72 69 74 79 5d 20 | 34 5d 5d 20 36 5d 29 0a |iority] |4]] 6]).|
|00003cf0| 28 64 65 66 61 6c 69 61 | 73 20 27 65 64 69 66 66 |(defalia|s 'ediff|
|00003d00| 2d 73 65 74 2d 66 69 6e | 65 2d 6f 76 65 72 6c 61 |-set-fin|e-overla|
|00003d10| 79 73 2d 66 6f 72 2d 63 | 6f 6d 62 69 6e 65 64 2d |ys-for-c|ombined-|
|00003d20| 6d 65 72 67 65 20 23 5b | 28 64 69 66 66 2d 6c 69 |merge #[|(diff-li|
|00003d30| 73 74 20 72 65 67 2d 6e | 75 6d 29 20 22 c0 89 89 |st reg-n|um) "...|
|00003d40| 19 1a 1b c4 0d 40 0d 41 | 40 0e 06 23 13 c4 c7 0d |.....@.A|@..#....|
|00003d50| 38 c8 0d 38 0e 06 23 12 | c4 c9 0d 38 ca 0d 38 0e |8..8..#.|...8..8.|
|00003d60| 06 23 11 cb 0e 0c 1e 0d | 1e 0e cf 0e 0e 0e 0d 5c |.#......|.......\|
|00003d70| 22 41 2a 4a 0e 10 48 d1 | d2 0b 5c 6e 09 23 49 2b |"A*J..H.|..\n.#I+|
|00003d80| 87 22 20 5b 6e 69 6c 20 | 6f 76 65 72 6c 61 79 33 |." [nil |overlay3|
|00003d90| 20 6f 76 65 72 6c 61 79 | 32 20 6f 76 65 72 6c 61 | overlay|2 overla|
|00003da0| 79 31 20 65 64 69 66 66 | 2d 6d 61 6b 65 2d 62 75 |y1 ediff|-make-bu|
|00003db0| 6c 6c 65 74 2d 70 72 6f | 6f 66 2d 6f 76 65 72 6c |llet-pro|of-overl|
|00003dc0| 61 79 20 64 69 66 66 2d | 6c 69 73 74 20 65 64 69 |ay diff-|list edi|
|00003dd0| 66 66 2d 62 75 66 66 65 | 72 2d 43 20 32 20 33 20 |ff-buffe|r-C 2 3 |
|00003de0| 34 20 35 20 43 20 65 64 | 69 66 66 2d 64 69 66 66 |4 5 C ed|iff-diff|
|00003df0| 65 72 65 6e 63 65 2d 76 | 65 63 74 6f 72 2d 61 6c |erence-v|ector-al|
|00003e00| 69 73 74 20 61 6c 69 73 | 74 20 62 75 66 2d 74 79 |ist alis|t buf-ty|
|00003e10| 70 65 20 61 73 73 6f 63 | 20 72 65 67 2d 6e 75 6d |pe assoc| reg-num|
|00003e20| 20 31 20 76 65 63 74 6f | 72 5d 20 36 5d 29 0a 28 | 1 vecto|r] 6]).(|
|00003e30| 64 65 66 61 6c 69 61 73 | 20 27 65 64 69 66 66 2d |defalias| 'ediff-|
|00003e40| 73 65 74 2d 66 69 6e 65 | 2d 6f 76 65 72 6c 61 79 |set-fine|-overlay|
|00003e50| 73 2d 69 6e 2d 6f 6e 65 | 2d 62 75 66 66 65 72 20 |s-in-one|-buffer |
|00003e60| 23 5b 28 62 75 66 2d 74 | 79 70 65 20 64 69 66 66 |#[(buf-t|ype diff|
|00003e70| 2d 6c 69 73 74 20 72 65 | 67 69 6f 6e 2d 6e 75 6d |-list re|gion-num|
|00003e80| 29 20 22 c0 19 c2 0b c4 | 0d 23 1e 06 0b c7 61 ab |) ".....|.#....a.|
|00003e90| 84 0e 08 aa 99 0b c9 61 | ab 84 0e 5c 6e aa 90 0b |.......a|...\n...|
|00003ea0| cb 61 ab 84 0e 0c aa 87 | 0b cd 61 ad 82 0e 0e 1e |.a......|..a.....|
|00003eb0| 0f d0 1e 11 d0 1e 12 d0 | 1e 13 d0 1e 14 d0 1e 15 |........|........|
|00003ec0| d0 1e 16 0d 0b 1b 1e 17 | d8 d9 0b 0e 1a 5c 22 4a |........|.....\"J|
|00003ed0| 0e 17 48 21 88 d9 0b 0e | 1a 5c 22 4a 0e 17 48 db |..H!....|.\"J..H.|
|00003ee0| d0 49 88 2a 0e 1c 41 16 | 1c 0e 0f ab 9a dd 0e 0f |.I.*..A.|........|
|00003ef0| 21 ab 94 de dd 0e 0f 21 | 21 ab 8c 72 0e 0f 71 88 |!......!|!..r..q.|
|00003f00| 0e 06 62 88 29 aa 8b 0e | 1f e0 61 ac 85 e1 0e 5c |..b.)...|..a....\|
|00003f10| 22 21 88 0e 23 ab 95 0b | cb 61 ab 90 e4 0d 21 89 |"!..#...|.a....!.|
|00003f20| 16 11 ab 88 e5 0e 11 0d | 5c 22 82 26 01 0e 1c ab |........|\".&....|
|00003f30| e7 09 54 11 0e 1c 40 89 | 16 13 0b c7 61 ab 83 e6 |..T...@.|....a...|
|00003f40| aa 89 0b c9 61 ab 83 e7 | aa 81 e8 48 16 14 0e 13 |....a...|...H....|
|00003f50| 0b c7 61 ab 83 db aa 89 | 0b c9 61 ab 83 e9 aa 81 |..a.....|..a.....|
|00003f60| ea 48 16 15 0e 14 ac 84 | 0e 15 ab a4 eb 0e 14 54 |.H......|.......T|
|00003f70| 0e 0f 5c 22 16 14 eb 0e | 15 0e 0f d5 23 16 15 ec |..\"....|....#...|
|00003f80| 0e 14 0e 15 0e 0f 23 16 | 16 0e 12 0e 16 43 a4 16 |......#.|.....C..|
|00003f90| 12 0e 1c 41 89 16 1c ac | 19 0b 0e 1a 1e 2d 1b ee |...A....|.....-..|
|00003fa0| 0b 0e 2d 5c 22 41 2a 4a | 0d 48 db ef 0e 12 21 49 |..-\"A*J|.H....!I|
|00003fb0| 2e 09 87 22 20 5b 2d 31 | 20 63 75 72 72 65 6e 74 |..." [-1| current|
|00003fc0| 2d 64 69 66 66 20 65 64 | 69 66 66 2d 67 65 74 2d |-diff ed|iff-get-|
|00003fd0| 64 69 66 66 2d 70 6f 73 | 6e 20 62 75 66 2d 74 79 |diff-pos|n buf-ty|
|00003fe0| 70 65 20 62 65 67 20 72 | 65 67 69 6f 6e 2d 6e 75 |pe beg r|egion-nu|
|00003ff0| 6d 20 72 65 67 2d 73 74 | 61 72 74 20 41 20 65 64 |m reg-st|art A ed|
|00004000| 69 66 66 2d 62 75 66 66 | 65 72 2d 41 20 42 20 65 |iff-buff|er-A B e|
|00004010| 64 69 66 66 2d 62 75 66 | 66 65 72 2d 42 20 43 20 |diff-buf|fer-B C |
|00004020| 65 64 69 66 66 2d 62 75 | 66 66 65 72 2d 43 20 41 |ediff-bu|ffer-C A|
|00004030| 6e 63 65 73 74 6f 72 20 | 65 64 69 66 66 2d 61 6e |ncestor |ediff-an|
|00004040| 63 65 73 74 6f 72 2d 62 | 75 66 66 65 72 20 62 75 |cestor-b|uffer bu|
|00004050| 66 66 20 6e 69 6c 20 63 | 6f 6d 62 69 6e 65 64 2d |ff nil c|ombined-|
|00004060| 6d 65 72 67 65 2d 64 69 | 66 66 2d 6c 69 73 74 20 |merge-di|ff-list |
|00004070| 64 69 66 66 2d 6f 76 65 | 72 6c 61 79 2d 6c 69 73 |diff-ove|rlay-lis|
|00004080| 74 20 6c 69 73 74 2d 65 | 6c 65 6d 65 6e 74 20 62 |t list-e|lement b|
|00004090| 65 67 69 6e 20 65 6e 64 | 20 6f 76 65 72 6c 61 79 |egin end| overlay|
|000040a0| 20 6e 20 65 64 69 66 66 | 2d 63 6c 65 61 72 2d 66 | n ediff|-clear-f|
|000040b0| 69 6e 65 2d 64 69 66 66 | 2d 76 65 63 74 6f 72 20 |ine-diff|-vector |
|000040c0| 65 64 69 66 66 2d 67 65 | 74 2d 73 79 6d 62 6f 6c |ediff-ge|t-symbol|
|000040d0| 2d 66 72 6f 6d 2d 61 6c | 69 73 74 20 65 64 69 66 |-from-al|ist edif|
|000040e0| 66 2d 64 69 66 66 65 72 | 65 6e 63 65 2d 76 65 63 |f-differ|ence-vec|
|000040f0| 74 6f 72 2d 61 6c 69 73 | 74 20 31 20 64 69 66 66 |tor-alis|t 1 diff|
|00004100| 2d 6c 69 73 74 20 67 65 | 74 2d 62 75 66 66 65 72 |-list ge|t-buffer|
|00004110| 20 62 75 66 66 65 72 2d | 6e 61 6d 65 20 74 68 69 | buffer-|name thi|
|00004120| 73 2d 63 6f 6d 6d 61 6e | 64 20 65 64 69 66 66 2d |s-comman|d ediff-|
|00004130| 71 75 69 74 20 65 72 72 | 6f 72 20 65 64 69 66 66 |quit err|or ediff|
|00004140| 2d 4b 49 4c 4c 45 44 2d | 56 49 54 41 4c 2d 42 55 |-KILLED-|VITAL-BU|
|00004150| 46 46 45 52 20 65 64 69 | 66 66 2d 6d 65 72 67 65 |FFER edi|ff-merge|
|00004160| 2d 6a 6f 62 20 65 64 69 | 66 66 2d 6c 6f 6f 6b 73 |-job edi|ff-looks|
|00004170| 2d 6c 69 6b 65 2d 63 6f | 6d 62 69 6e 65 64 2d 6d |-like-co|mbined-m|
|00004180| 65 72 67 65 20 65 64 69 | 66 66 2d 73 65 74 2d 66 |erge edi|ff-set-f|
|00004190| 69 6e 65 2d 6f 76 65 72 | 6c 61 79 73 2d 66 6f 72 |ine-over|lays-for|
|000041a0| 2d 63 6f 6d 62 69 6e 65 | 64 2d 6d 65 72 67 65 20 |-combine|d-merge |
|000041b0| 30 20 32 20 34 20 33 20 | 35 20 65 64 69 66 66 2d |0 2 4 3 |5 ediff-|
|000041c0| 67 6f 74 6f 2d 77 6f 72 | 64 20 65 64 69 66 66 2d |goto-wor|d ediff-|
|000041d0| 6d 61 6b 65 2d 62 75 6c | 6c 65 74 2d 70 72 6f 6f |make-bul|let-proo|
|000041e0| 66 2d 6f 76 65 72 6c 61 | 79 20 61 6c 69 73 74 20 |f-overla|y alist |
|000041f0| 61 73 73 6f 63 20 76 63 | 6f 6e 63 61 74 5d 20 35 |assoc vc|oncat] 5|
|00004200| 5d 29 0a 28 64 65 66 61 | 6c 69 61 73 20 27 65 64 |]).(defa|lias 'ed|
|00004210| 69 66 66 2d 67 65 74 2d | 64 69 66 66 33 2d 67 72 |iff-get-|diff3-gr|
|00004220| 6f 75 70 20 23 5b 28 66 | 69 6c 65 29 20 22 8a c0 |oup #[(f|ile) "..|
|00004230| c1 5c 6e c3 51 21 88 c4 | 79 88 c5 94 c5 95 7b c6 |.\n.Q!..|y.....{.|
|00004240| 98 ab a6 c7 94 ab 92 c8 | c4 94 c4 95 7b 21 c8 c9 |........|....{!..|
|00004250| 94 c9 95 7b 21 54 44 aa | 9a c8 c4 94 c4 95 7b 21 |...{!TD.|......{!|
|00004260| 89 1e 5c 6e 89 54 29 44 | aa 8a c8 c4 94 c4 95 7b |..\n.T)D|.......{|
|00004270| 21 54 89 44 29 87 22 20 | 5b 72 65 2d 73 65 61 72 |!T.D)." |[re-sear|
|00004280| 63 68 2d 66 6f 72 77 61 | 72 64 20 22 5e 22 20 66 |ch-forwa|rd "^" f|
|00004290| 69 6c 65 20 22 3a 5c 5c | 28 5b 30 2d 39 5d 2b 5c |ile ":\\|([0-9]+\|
|000042a0| 5c 29 5c 5c 28 2c 5c 5c | 28 5b 30 2d 39 5d 2b 5c |\)\\(,\\|([0-9]+\|
|000042b0| 5c 29 5c 5c 29 3f 5c 5c | 28 5b 61 63 5d 5c 5c 29 |\)\\)?\\|([ac]\\)|
|000042c0| 24 22 20 31 20 34 20 22 | 63 22 20 32 20 73 74 72 |$" 1 4 "|c" 2 str|
|000042d0| 69 6e 67 2d 74 6f 2d 69 | 6e 74 20 33 20 78 5d 20 |ing-to-i|nt 3 x] |
|000042e0| 35 5d 29 0a 28 64 65 66 | 61 6c 69 61 73 20 27 65 |5]).(def|alias 'e|
|000042f0| 64 69 66 66 2d 65 78 74 | 72 61 63 74 2d 64 69 66 |diff-ext|ract-dif|
|00004300| 66 73 33 20 23 5b 28 64 | 69 66 66 2d 62 75 66 66 |fs3 #[(d|iff-buff|
|00004310| 65 72 20 77 6f 72 64 2d | 6d 6f 64 65 20 74 68 72 |er word-|mode thr|
|00004320| 65 65 2d 77 61 79 2d 63 | 6f 6d 70 20 26 6f 70 74 |ee-way-c|omp &opt|
|00004330| 69 6f 6e 61 6c 20 62 6f | 75 6e 64 73 29 20 22 08 |ional bo|unds) ".|
|00004340| 09 5c 6e 0b c4 89 89 89 | c5 89 89 89 1e 06 1e 07 |.\n.....|........|
|00004350| 1e 08 1e 09 1e 5c 6e 1e | 0b 1e 0c 1e 0d 1e 0e 1e |.....\n.|........|
|00004360| 0f 1e 10 1e 11 0e 12 ab | 83 d3 aa 81 d4 0e 09 42 |........|.......B|
|00004370| 16 09 0e 15 ab da 0e 15 | 40 1e 16 d7 0e 16 21 ad |........|@.....!.|
|00004380| 8e 0e 18 ab 86 d9 0e 16 | 21 aa 84 da 0e 16 21 29 |........|!.....!)|
|00004390| 16 08 0e 15 41 40 1e 16 | d7 0e 16 21 ad 8e 0e 18 |....A@..|...!....|
|000043a0| ab 86 d9 0e 16 21 aa 84 | da 0e 16 21 29 16 07 0e |.....!..|...!)...|
|000043b0| 1b ad 9b dc 0e 15 38 1e | 16 d7 0e 16 21 ad 8e 0e |......8.|....!...|
|000043c0| 18 ab 86 d9 0e 16 21 aa | 84 da 0e 16 21 29 16 06 |......!.|....!)..|
|000043d0| 0e 11 ab a1 dd 0e 11 21 | ab 9b de dd 0e 11 21 21 |.......!|......!!|
|000043e0| ab 93 72 0e 11 71 88 0e | 08 ab 84 0e 08 aa 81 65 |..r..q..|.......e|
|000043f0| 62 88 29 aa 8b 0e 1f e0 | 61 ac 85 e1 0e 5c 22 21 |b.).....|a....\"!|
|00004400| 88 0e 10 ab a1 dd 0e 10 | 21 ab 9b de dd 0e 10 21 |........|!......!|
|00004410| 21 ab 93 72 0e 10 71 88 | 0e 07 ab 84 0e 07 aa 81 |!..r..q.|........|
|00004420| 65 62 88 29 aa 8b 0e 1f | e0 61 ac 85 e1 0e 5c 22 |eb.)....|.a....\"|
|00004430| 21 88 0e 1b ab b0 0e 0f | ab a1 dd 0e 0f 21 ab 9b |!.......|.....!..|
|00004440| de dd 0e 0f 21 21 ab 93 | 72 0e 0f 71 88 0e 06 ab |....!!..|r..q....|
|00004450| 84 0e 06 aa 81 65 62 88 | 29 aa 8b 0e 1f e0 61 ac |.....eb.|).....a.|
|00004460| 85 e1 0e 5c 22 21 88 0e | 0e ab b6 dd 0e 0e 21 ab |...\"!..|......!.|
|00004470| b0 de dd 0e 0e 21 21 ab | a8 0e 0e ab 99 dd 0e 0e |.....!!.|........|
|00004480| 21 ab 93 de dd 0e 0e 21 | 21 ab 8b 72 0e 0e 71 88 |!......!|!..r..q.|
|00004490| 65 62 88 29 aa 8b 0e 1f | e0 61 ac 85 e1 0e 5c 22 |eb.)....|.a....\"|
|000044a0| 21 88 0e 23 83 da 03 dd | 0e 23 21 83 da 03 de dd |!..#....|.#!.....|
|000044b0| 0e 23 21 21 83 da 03 72 | 0e 23 71 88 65 62 88 e4 |.#!!...r|.#q.eb..|
|000044c0| 0e 25 c5 e6 23 83 d7 03 | c4 79 88 c4 94 c4 95 7b |.%..#...|.y.....{|
|000044d0| 1e 27 0e 1b ac 87 0e 27 | e8 98 84 d3 03 e9 ea 21 |.'.....'|.......!|
|000044e0| 40 1e 2b e9 ea 21 41 40 | 1e 2c e9 ed 21 40 1e 2e |@.+..!A@|.,..!@..|
|000044f0| e9 ed 21 41 40 1e 2f e9 | e8 21 40 1e 30 e9 e8 21 |..!A@./.|.!@.0..!|
|00004500| 41 40 1e 31 0e 27 ea 98 | ab 83 f2 aa 8b 0e 27 ed |A@.1.'..|......'.|
|00004510| 98 ab 83 f3 aa 82 0e 34 | 89 1e 35 f6 73 ab 83 f7 |.......4|..5.s...|
|00004520| aa 81 f8 1e 39 0e 27 ea | 98 ab 83 f8 aa 90 0e 27 |....9.'.|.......'|
|00004530| ed 98 ab 83 f7 aa 87 0e | 27 e8 98 ad 81 fa 1e 3b |........|'......;|
|00004540| c5 1e 3c c5 1e 3d c5 1e | 3e c5 1e 3f c5 1e 40 c5 |..<..=..|>..?..@.|
|00004550| 1e 41 c5 1e 42 c5 1e 43 | c5 1e 44 c5 1e 45 c5 1e |.A..B..C|..D..E..|
|00004560| 46 0e 30 0e 31 55 16 3c | 0e 1b ab 8a 0e 30 16 3d |F.0.1U.<|.....0.=|
|00004570| 0e 31 16 3e aa 9a 0e 34 | 81 47 00 61 ab 8a 0e 2e |.1.>...4|.G.a....|
|00004580| 16 3d 0e 2f 16 3e aa 88 | 0e 2b 16 3d 0e 2c 16 3e |.=./.>..|.+.=.,.>|
|00004590| 0e 12 ab bd 0e 09 81 48 | 00 0e 2b 0e 0d 5a 0e 2c |.......H|..+..Z.,|
|000045a0| 0e 2b 5a 0e 2e 0e 0c 5a | 0e 2f 0e 2e 5a 0e 3d 0e |.+Z....Z|./..Z.=.|
|000045b0| 0b 5a 0e 3e 0e 3d 5a c5 | 89 89 89 89 26 0b 43 a4 |.Z.>.=Z.|....&.C.|
|000045c0| 16 09 0e 2c 16 0d 0e 2f | 16 0c 0e 3e 16 0b 82 d1 |...,.../|...>....|
|000045d0| 03 0e 11 ab ae dd 0e 11 | 21 ab a8 de dd 0e 11 21 |........|!......!|
|000045e0| 21 ab a0 72 0e 11 71 88 | 0e 2b 0e 0d 5a 79 88 60 |!..r..q.|.+..Zy.`|
|000045f0| 16 3f 0e 2c 0e 2b 5a 79 | 88 60 16 40 0e 2c 16 0d |.?.,.+Zy|.`.@.,..|
|00004600| 29 aa 8b 0e 1f e0 61 ac | 85 e1 0e 5c 22 21 88 0e |).....a.|...\"!..|
|00004610| 10 ab ae dd 0e 10 21 ab | a8 de dd 0e 10 21 21 ab |......!.|.....!!.|
|00004620| a0 72 0e 10 71 88 0e 2e | 0e 0c 5a 79 88 60 16 41 |.r..q...|..Zy.`.A|
|00004630| 0e 2f 0e 2e 5a 79 88 60 | 16 42 0e 2f 16 0c 29 aa |./..Zy.`|.B./..).|
|00004640| 8b 0e 1f e0 61 ac 85 e1 | 0e 5c 22 21 88 0e 0f ab |....a...|.\"!....|
|00004650| ae dd 0e 0f 21 ab a8 de | dd 0e 0f 21 21 ab a0 72 |....!...|...!!..r|
|00004660| 0e 0f 71 88 0e 3d 0e 0b | 5a 79 88 60 16 43 0e 3e |..q..=..|Zy.`.C.>|
|00004670| 0e 3d 5a 79 88 60 16 44 | 0e 3e 16 0b 29 aa 8b 0e |.=Zy.`.D|.>..)...|
|00004680| 1f e0 61 ac 85 e1 0e 5c | 22 21 88 0e 0e ab cb dd |..a....\|"!......|
|00004690| 0e 0e 21 ab c5 de dd 0e | 0e 21 21 ab bd 0e 0e ab |..!.....|.!!.....|
|000046a0| ae dd 0e 0e 21 ab a8 de | dd 0e 0e 21 21 ab a0 72 |....!...|...!!..r|
|000046b0| 0e 0e 71 88 0e 30 0e 5c | 6e 5a 79 88 60 16 45 0e |..q..0.\|nZy.`.E.|
|000046c0| 31 0e 30 5a 79 88 60 16 | 46 0e 31 16 5c 6e 29 aa |1.0Zy.`.|F.1.\n).|
|000046d0| 8b 0e 1f e0 61 ac 85 e1 | 0e 5c 22 21 88 0e 09 0e |....a...|.\"!....|
|000046e0| 1b ab 9a 81 48 00 0e 3f | 0e 40 0e 41 0e 42 0e 43 |....H..?|.@.A.B.C|
|000046f0| 0e 44 c5 89 0e 3b c5 89 | 26 0b 43 aa 9c 81 48 00 |.D...;..|&.C...H.|
|00004700| 0e 3f 0e 40 0e 41 0e 42 | 0e 43 0e 44 0e 45 0e 46 |.?.@.A.B|.C.D.E.F|
|00004710| 0e 39 0e 35 0e 3c 26 0b | 43 a4 16 09 2e 14 29 82 |.9.5.<&.|C.....).|
|00004720| 7a 01 29 aa 8b 0e 1f e0 | 61 ac 85 e1 0e 5c 22 21 |z.).....|a....\"!|
|00004730| 88 0e 09 2e 0c 87 22 20 | 5b 65 64 69 66 66 2d 62 |......" |[ediff-b|
|00004740| 75 66 66 65 72 2d 41 20 | 65 64 69 66 66 2d 62 75 |uffer-A |ediff-bu|
|00004750| 66 66 65 72 2d 42 20 65 | 64 69 66 66 2d 62 75 66 |ffer-B e|diff-buf|
|00004760| 66 65 72 2d 43 20 65 64 | 69 66 66 2d 61 6e 63 65 |fer-C ed|iff-ance|
|00004770| 73 74 6f 72 2d 62 75 66 | 66 65 72 20 31 20 6e 69 |stor-buf|fer 1 ni|
|00004780| 6c 20 73 68 69 66 74 2d | 43 20 73 68 69 66 74 2d |l shift-|C shift-|
|00004790| 42 20 73 68 69 66 74 2d | 41 20 64 69 66 66 2d 6c |B shift-|A diff-l|
|000047a0| 69 73 74 20 61 6e 63 2d | 70 72 65 76 20 63 2d 70 |ist anc-|prev c-p|
|000047b0| 72 65 76 20 62 2d 70 72 | 65 76 20 61 2d 70 72 65 |rev b-pr|ev a-pre|
|000047c0| 76 20 61 6e 63 2d 62 75 | 66 66 65 72 20 43 2d 62 |v anc-bu|ffer C-b|
|000047d0| 75 66 66 65 72 20 42 2d | 62 75 66 66 65 72 20 41 |uffer B-|buffer A|
|000047e0| 2d 62 75 66 66 65 72 20 | 77 6f 72 64 2d 6d 6f 64 |-buffer |word-mod|
|000047f0| 65 20 77 6f 72 64 73 20 | 70 6f 69 6e 74 73 20 62 |e words |points b|
|00004800| 6f 75 6e 64 73 20 6f 76 | 65 72 6c 20 65 64 69 66 |ounds ov|erl edif|
|00004810| 66 2d 6f 76 65 72 6c 61 | 79 70 20 65 64 69 66 66 |f-overla|yp ediff|
|00004820| 2d 65 6d 61 63 73 2d 70 | 20 6f 76 65 72 6c 61 79 |-emacs-p| overlay|
|00004830| 2d 73 74 61 72 74 20 65 | 78 74 65 6e 74 2d 73 74 |-start e|xtent-st|
|00004840| 61 72 74 2d 70 6f 73 69 | 74 69 6f 6e 20 74 68 72 |art-posi|tion thr|
|00004850| 65 65 2d 77 61 79 2d 63 | 6f 6d 70 20 32 20 67 65 |ee-way-c|omp 2 ge|
|00004860| 74 2d 62 75 66 66 65 72 | 20 62 75 66 66 65 72 2d |t-buffer| buffer-|
|00004870| 6e 61 6d 65 20 74 68 69 | 73 2d 63 6f 6d 6d 61 6e |name thi|s-comman|
|00004880| 64 20 65 64 69 66 66 2d | 71 75 69 74 20 65 72 72 |d ediff-|quit err|
|00004890| 6f 72 20 65 64 69 66 66 | 2d 4b 49 4c 4c 45 44 2d |or ediff|-KILLED-|
|000048a0| 56 49 54 41 4c 2d 42 55 | 46 46 45 52 20 64 69 66 |VITAL-BU|FFER dif|
|000048b0| 66 2d 62 75 66 66 65 72 | 20 72 65 2d 73 65 61 72 |f-buffer| re-sear|
|000048c0| 63 68 2d 66 6f 72 77 61 | 72 64 20 65 64 69 66 66 |ch-forwa|rd ediff|
|000048d0| 2d 6d 61 74 63 68 2d 64 | 69 66 66 33 2d 6c 69 6e |-match-d|iff3-lin|
|000048e0| 65 20 74 20 61 67 72 65 | 65 6d 65 6e 74 20 22 33 |e t agre|ement "3|
|000048f0| 22 20 65 64 69 66 66 2d | 67 65 74 2d 64 69 66 66 |" ediff-|get-diff|
|00004900| 33 2d 67 72 6f 75 70 20 | 22 31 22 20 61 2d 62 65 |3-group |"1" a-be|
|00004910| 67 69 6e 20 61 2d 65 6e | 64 20 22 32 22 20 62 2d |gin a-en|d "2" b-|
|00004920| 62 65 67 69 6e 20 62 2d | 65 6e 64 20 63 2d 6f 72 |begin b-|end c-or|
|00004930| 2d 61 6e 63 2d 62 65 67 | 69 6e 20 63 2d 6f 72 2d |-anc-beg|in c-or-|
|00004940| 61 6e 63 2d 65 6e 64 20 | 70 72 65 66 65 72 2d 41 |anc-end |prefer-A|
|00004950| 20 70 72 65 66 65 72 2d | 42 20 65 64 69 66 66 2d | prefer-|B ediff-|
|00004960| 64 65 66 61 75 6c 74 2d | 76 61 72 69 61 6e 74 20 |default-|variant |
|00004970| 73 74 61 74 65 2d 6f 66 | 2d 6d 65 72 67 65 20 28 |state-of|-merge (|
|00004980| 64 65 66 61 75 6c 74 2d | 41 20 70 72 65 66 65 72 |default-|A prefer|
|00004990| 2d 41 29 20 42 20 41 20 | 73 74 61 74 65 2d 6f 66 |-A) B A |state-of|
|000049a0| 2d 64 69 66 66 2d 6d 65 | 72 67 65 20 43 20 73 74 |-diff-me|rge C st|
|000049b0| 61 74 65 2d 6f 66 2d 64 | 69 66 66 2d 63 6f 6d 70 |ate-of-d|iff-comp|
|000049c0| 61 72 69 73 6f 6e 20 73 | 74 61 74 65 2d 6f 66 2d |arison s|tate-of-|
|000049d0| 61 6e 63 65 73 74 6f 72 | 20 63 2d 62 65 67 69 6e |ancestor| c-begin|
|000049e0| 20 63 2d 65 6e 64 20 61 | 2d 62 65 67 69 6e 2d 70 | c-end a|-begin-p|
|000049f0| 74 20 61 2d 65 6e 64 2d | 70 74 20 62 2d 62 65 67 |t a-end-|pt b-beg|
|00004a00| 69 6e 2d 70 74 20 62 2d | 65 6e 64 2d 70 74 20 63 |in-pt b-|end-pt c|
|00004a10| 2d 62 65 67 69 6e 2d 70 | 74 20 63 2d 65 6e 64 2d |-begin-p|t c-end-|
|00004a20| 70 74 20 61 6e 63 2d 62 | 65 67 69 6e 2d 70 74 20 |pt anc-b|egin-pt |
|00004a30| 61 6e 63 2d 65 6e 64 2d | 70 74 20 64 65 66 61 75 |anc-end-|pt defau|
|00004a40| 6c 74 2d 42 20 76 65 63 | 74 6f 72 5d 20 31 34 5d |lt-B vec|tor] 14]|
|00004a50| 29 0a 28 64 65 66 61 6c | 69 61 73 20 27 65 64 69 |).(defal|ias 'edi|
|00004a60| 66 66 2d 73 65 74 75 70 | 2d 64 69 66 66 2d 72 65 |ff-setup|-diff-re|
|00004a70| 67 69 6f 6e 73 33 20 23 | 5b 28 66 69 6c 65 2d 41 |gions3 #|[(file-A|
|00004a80| 20 66 69 6c 65 2d 42 20 | 66 69 6c 65 2d 43 29 20 | file-B |file-C) |
|00004a90| 22 08 ab 8c c1 08 21 ab | 87 c2 c1 08 21 21 ac 87 |".....!.|....!!..|
|00004aa0| c3 c4 c5 c6 5c 22 21 10 | c7 c8 21 88 c9 0e 5c 6e |....\"!.|..!...\n|
|00004ab0| 08 cb 0e 0c 0e 0d 0e 0e | 0e 0f 26 07 88 d0 0e 11 |........|..&.....|
|00004ac0| 08 5c 22 88 d2 d3 08 0e | 14 0e 15 0e 16 24 21 87 |.\".....|.....$!.|
|00004ad0| 22 20 5b 65 64 69 66 66 | 2d 64 69 66 66 2d 62 75 |" [ediff|-diff-bu|
|00004ae0| 66 66 65 72 20 67 65 74 | 2d 62 75 66 66 65 72 20 |ffer get|-buffer |
|00004af0| 62 75 66 66 65 72 2d 6e | 61 6d 65 20 67 65 74 2d |buffer-n|ame get-|
|00004b00| 62 75 66 66 65 72 2d 63 | 72 65 61 74 65 20 65 64 |buffer-c|reate ed|
|00004b10| 69 66 66 2d 75 6e 69 71 | 75 65 2d 62 75 66 66 65 |iff-uniq|ue-buffe|
|00004b20| 72 2d 6e 61 6d 65 20 22 | 2a 65 64 69 66 66 2d 64 |r-name "|*ediff-d|
|00004b30| 69 66 66 22 20 22 2a 22 | 20 6d 65 73 73 61 67 65 |iff" "*"| message|
|00004b40| 20 22 43 6f 6d 70 75 74 | 69 6e 67 20 64 69 66 66 | "Comput|ing diff|
|00004b50| 65 72 65 6e 63 65 73 20 | 2e 2e 2e 22 20 65 64 69 |erences |..." edi|
|00004b60| 66 66 2d 65 78 65 63 2d | 70 72 6f 63 65 73 73 20 |ff-exec-|process |
|00004b70| 65 64 69 66 66 2d 64 69 | 66 66 33 2d 70 72 6f 67 |ediff-di|ff3-prog|
|00004b80| 72 61 6d 20 73 79 6e 63 | 68 72 6f 6e 69 7a 65 20 |ram sync|hronize |
|00004b90| 65 64 69 66 66 2d 64 69 | 66 66 33 2d 6f 70 74 69 |ediff-di|ff3-opti|
|00004ba0| 6f 6e 73 20 66 69 6c 65 | 2d 41 20 66 69 6c 65 2d |ons file|-A file-|
|00004bb0| 42 20 66 69 6c 65 2d 43 | 20 65 64 69 66 66 2d 70 |B file-C| ediff-p|
|00004bc0| 72 65 70 61 72 65 2d 65 | 72 72 6f 72 2d 6c 69 73 |repare-e|rror-lis|
|00004bd0| 74 20 65 64 69 66 66 2d | 64 69 66 66 33 2d 6f 6b |t ediff-|diff3-ok|
|00004be0| 2d 6c 69 6e 65 73 2d 72 | 65 67 65 78 70 20 65 64 |-lines-r|egexp ed|
|00004bf0| 69 66 66 2d 63 6f 6e 76 | 65 72 74 2d 64 69 66 66 |iff-conv|ert-diff|
|00004c00| 73 2d 74 6f 2d 6f 76 65 | 72 6c 61 79 73 20 65 64 |s-to-ove|rlays ed|
|00004c10| 69 66 66 2d 65 78 74 72 | 61 63 74 2d 64 69 66 66 |iff-extr|act-diff|
|00004c20| 73 33 20 65 64 69 66 66 | 2d 77 6f 72 64 2d 6d 6f |s3 ediff|-word-mo|
|00004c30| 64 65 20 65 64 69 66 66 | 2d 33 77 61 79 2d 63 6f |de ediff|-3way-co|
|00004c40| 6d 70 61 72 69 73 6f 6e | 2d 6a 6f 62 20 65 64 69 |mparison|-job edi|
|00004c50| 66 66 2d 6e 61 72 72 6f | 77 2d 62 6f 75 6e 64 73 |ff-narro|w-bounds|
|00004c60| 5d 20 38 5d 29 0a 28 64 | 65 66 61 6c 69 61 73 20 |] 8]).(d|efalias |
|00004c70| 27 65 64 69 66 66 2d 65 | 78 65 63 2d 70 72 6f 63 |'ediff-e|xec-proc|
|00004c80| 65 73 73 20 23 5b 28 70 | 72 6f 67 72 61 6d 20 62 |ess #[(p|rogram b|
|00004c90| 75 66 66 65 72 20 73 79 | 6e 63 68 20 6f 70 74 69 |uffer sy|nch opti|
|00004ca0| 6f 6e 73 20 26 72 65 73 | 74 20 66 69 6c 65 73 29 |ons &res|t files)|
|00004cb0| 20 22 c0 20 c1 1a 1b c4 | c5 0e 06 21 0e 07 5c 22 | ". ....|...!..\"|
|00004cc0| 12 c8 c9 ca c1 5c 6e 5c | 22 5c 22 12 cb 8e 0e 0c |.....\n\|"\".....|
|00004cd0| c1 1e 0d 1e 0e 8a 0e 0f | 71 88 d0 20 88 0e 0e 16 |........|q.. ....|
|00004ce0| 0c 0e 11 d2 73 ac 84 0e | 13 ab 8d d4 d5 0e 16 c1 |....s...|........|
|00004cf0| 0e 0f c1 5c 6e 26 06 aa | a7 d7 0e 0f 21 89 16 0d |...\n&..|....!...|
|00004d00| ab 85 d8 0e 0d 21 88 d4 | d9 da 0e 0f 0e 16 5c 6e |.....!..|......\n|
|00004d10| 25 16 0d db 16 1c dd 0e | 0d de 5c 22 88 df 0e 0d |%.......|..\"....|
|00004d20| e0 5c 22 2e 06 87 22 20 | 5b 6d 61 74 63 68 2d 64 |.\"..." |[match-d|
|00004d30| 61 74 61 20 6e 69 6c 20 | 61 72 67 73 20 64 61 74 |ata nil |args dat|
|00004d40| 61 20 61 70 70 65 6e 64 | 20 73 70 6c 69 74 2d 73 |a append| split-s|
|00004d50| 74 72 69 6e 67 20 6f 70 | 74 69 6f 6e 73 20 66 69 |tring op|tions fi|
|00004d60| 6c 65 73 20 64 65 6c 65 | 74 65 20 22 22 20 64 65 |les dele|te "" de|
|00004d70| 6c 71 20 28 28 73 74 6f | 72 65 2d 6d 61 74 63 68 |lq ((sto|re-match|
|00004d80| 2d 64 61 74 61 20 64 61 | 74 61 29 29 20 64 65 66 |-data da|ta)) def|
|00004d90| 61 75 6c 74 2d 64 69 72 | 65 63 74 6f 72 79 20 70 |ault-dir|ectory p|
|00004da0| 72 6f 63 20 64 69 72 65 | 63 74 6f 72 79 20 62 75 |roc dire|ctory bu|
|00004db0| 66 66 65 72 20 65 72 61 | 73 65 2d 62 75 66 66 65 |ffer era|se-buffe|
|00004dc0| 72 20 73 79 73 74 65 6d | 2d 74 79 70 65 20 28 65 |r system|-type (e|
|00004dd0| 6d 78 20 6d 73 2d 64 6f | 73 20 77 69 6e 64 6f 77 |mx ms-do|s window|
|00004de0| 73 2d 6e 74 20 77 69 6e | 64 6f 77 73 2d 39 35 29 |s-nt win|dows-95)|
|00004df0| 20 73 79 6e 63 68 20 61 | 70 70 6c 79 20 63 61 6c | synch a|pply cal|
|00004e00| 6c 2d 70 72 6f 63 65 73 | 73 20 70 72 6f 67 72 61 |l-proces|s progra|
|00004e10| 6d 20 67 65 74 2d 62 75 | 66 66 65 72 2d 70 72 6f |m get-bu|ffer-pro|
|00004e20| 63 65 73 73 20 6b 69 6c | 6c 2d 70 72 6f 63 65 73 |cess kil|l-proces|
|00004e30| 73 20 73 74 61 72 74 2d | 70 72 6f 63 65 73 73 20 |s start-|process |
|00004e40| 22 43 75 73 74 6f 6d 20 | 44 69 66 66 22 20 28 22 |"Custom |Diff" ("|
|00004e50| 3a 25 73 22 29 20 6d 6f | 64 65 2d 6c 69 6e 65 2d |:%s") mo|de-line-|
|00004e60| 70 72 6f 63 65 73 73 20 | 73 65 74 2d 70 72 6f 63 |process |set-proc|
|00004e70| 65 73 73 2d 73 65 6e 74 | 69 6e 65 6c 20 65 64 69 |ess-sent|inel edi|
|00004e80| 66 66 2d 70 72 6f 63 65 | 73 73 2d 73 65 6e 74 69 |ff-proce|ss-senti|
|00004e90| 6e 65 6c 20 73 65 74 2d | 70 72 6f 63 65 73 73 2d |nel set-|process-|
|00004ea0| 66 69 6c 74 65 72 20 65 | 64 69 66 66 2d 70 72 6f |filter e|diff-pro|
|00004eb0| 63 65 73 73 2d 66 69 6c | 74 65 72 5d 20 38 5d 29 |cess-fil|ter] 8])|
|00004ec0| 0a 28 64 65 66 61 6c 69 | 61 73 20 27 65 64 69 66 |.(defali|as 'edif|
|00004ed0| 66 2d 70 72 6f 63 65 73 | 73 2d 66 69 6c 74 65 72 |f-proces|s-filter|
|00004ee0| 20 23 5b 28 70 72 6f 63 | 20 73 74 72 69 6e 67 29 | #[(proc| string)|
|00004ef0| 20 22 70 18 c1 5c 6e 21 | 1b c4 1d c6 0b 21 1e 07 | "p..\n!|.....!..|
|00004f00| c8 0e 07 21 1e 09 ca 8e | 0b 71 88 60 64 55 ac 82 |...!....|.q.`dU..|
|00004f10| 60 15 64 62 88 cb 0e 0c | 21 2e 06 87 22 20 5b 6f |`.db....|!..." [o|
|00004f20| 62 75 66 20 70 72 6f 63 | 65 73 73 2d 62 75 66 66 |buf proc|ess-buff|
|00004f30| 65 72 20 70 72 6f 63 20 | 62 75 66 66 65 72 20 6e |er proc |buffer n|
|00004f40| 69 6c 20 6f 70 6f 69 6e | 74 20 67 65 74 2d 62 75 |il opoin|t get-bu|
|00004f50| 66 66 65 72 2d 77 69 6e | 64 6f 77 20 77 69 6e 64 |ffer-win|dow wind|
|00004f60| 6f 77 20 77 69 6e 64 6f | 77 2d 73 74 61 72 74 20 |ow windo|w-start |
|00004f70| 70 6f 73 20 28 28 62 79 | 74 65 2d 63 6f 64 65 20 |pos ((by|te-code |
|00004f80| 22 c0 09 5c 6e 5c 22 88 | 0b ab 83 0b 62 88 0c 71 |"..\n\".|....b..q|
|00004f90| 87 22 20 5b 73 65 74 2d | 77 69 6e 64 6f 77 2d 73 |." [set-|window-s|
|00004fa0| 74 61 72 74 20 77 69 6e | 64 6f 77 20 70 6f 73 20 |tart win|dow pos |
|00004fb0| 6f 70 6f 69 6e 74 20 6f | 62 75 66 5d 20 33 29 29 |opoint o|buf] 3))|
|00004fc0| 20 69 6e 73 65 72 74 2d | 62 65 66 6f 72 65 2d 6d | insert-|before-m|
|00004fd0| 61 72 6b 65 72 73 20 73 | 74 72 69 6e 67 5d 20 32 |arkers s|tring] 2|
|00004fe0| 5d 29 0a 28 64 65 66 61 | 6c 69 61 73 20 27 65 64 |]).(defa|lias 'ed|
|00004ff0| 69 66 66 2d 70 72 6f 63 | 65 73 73 2d 73 65 6e 74 |iff-proc|ess-sent|
|00005000| 69 6e 65 6c 20 23 5b 28 | 70 72 6f 63 65 73 73 20 |inel #[(|process |
|00005010| 73 69 67 6e 61 6c 29 20 | 22 c0 09 21 c2 73 ad 94 |signal) |"..!.s..|
|00005020| c3 c4 09 21 21 ad 8d 8a | c4 09 21 71 88 c5 16 06 |...!!...|..!q....|
|00005030| 29 c7 09 21 87 22 20 5b | 70 72 6f 63 65 73 73 2d |)..!." [|process-|
|00005040| 73 74 61 74 75 73 20 70 | 72 6f 63 65 73 73 20 28 |status p|rocess (|
|00005050| 65 78 69 74 20 73 69 67 | 6e 61 6c 29 20 62 75 66 |exit sig|nal) buf|
|00005060| 66 65 72 2d 6e 61 6d 65 | 20 70 72 6f 63 65 73 73 |fer-name| process|
|00005070| 2d 62 75 66 66 65 72 20 | 6e 69 6c 20 6d 6f 64 65 |-buffer |nil mode|
|00005080| 2d 6c 69 6e 65 2d 70 72 | 6f 63 65 73 73 20 64 65 |-line-pr|ocess de|
|00005090| 6c 65 74 65 2d 70 72 6f | 63 65 73 73 5d 20 33 5d |lete-pro|cess] 3]|
|000050a0| 29 0a 23 40 31 30 36 20 | 2a 46 75 6e 63 74 69 6f |).#@106 |*Functio|
|000050b0| 6e 20 74 6f 20 63 61 6c | 6c 20 74 6f 20 6d 6f 76 |n to cal|l to mov|
|000050c0| 65 20 74 6f 20 74 68 65 | 20 6e 65 78 74 20 77 6f |e to the| next wo|
|000050d0| 72 64 2e 0a 55 73 65 64 | 20 66 6f 72 20 73 70 6c |rd..Used| for spl|
|000050e0| 69 74 74 69 6e 67 20 64 | 69 66 66 65 72 65 6e 63 |itting d|ifferenc|
|000050f0| 65 20 72 65 67 69 6f 6e | 73 20 69 6e 74 6f 20 69 |e region|s into i|
|00005100| 6e 64 69 76 69 64 75 61 | 6c 20 77 6f 72 64 73 2e |ndividua|l words.|
|00005110| 1f 0a 28 64 65 66 76 61 | 72 20 65 64 69 66 66 2d |..(defva|r ediff-|
|00005120| 66 6f 72 77 61 72 64 2d | 77 6f 72 64 2d 66 75 6e |forward-|word-fun|
|00005130| 63 74 69 6f 6e 20 27 65 | 64 69 66 66 2d 66 6f 72 |ction 'e|diff-for|
|00005140| 77 61 72 64 2d 77 6f 72 | 64 20 28 23 24 20 2e 20 |ward-wor|d (#$ . |
|00005150| 2d 32 30 36 34 38 29 29 | 0a 23 40 31 31 33 20 2a |-20648))|.#@113 *|
|00005160| 43 68 61 72 61 63 74 65 | 72 73 20 63 6f 6e 73 74 |Characte|rs const|
|00005170| 69 74 75 74 69 6e 67 20 | 77 68 69 74 65 20 73 70 |ituting |white sp|
|00005180| 61 63 65 2e 0a 54 68 65 | 73 65 20 63 68 61 72 61 |ace..The|se chara|
|00005190| 63 74 65 72 73 20 61 72 | 65 20 69 67 6e 6f 72 65 |cters ar|e ignore|
|000051a0| 64 20 77 68 65 6e 20 64 | 69 66 66 65 72 69 6e 67 |d when d|iffering|
|000051b0| 20 72 65 67 69 6f 6e 73 | 20 61 72 65 20 73 70 6c | regions| are spl|
|000051c0| 69 74 20 69 6e 74 6f 20 | 77 6f 72 64 73 2e 1f 0a |it into |words...|
|000051d0| 28 64 65 66 76 61 72 20 | 65 64 69 66 66 2d 77 68 |(defvar |ediff-wh|
|000051e0| 69 74 65 73 70 61 63 65 | 20 22 20 5c 6e 09 0c 22 |itespace| " \n.."|
|000051f0| 20 28 23 24 20 2e 20 2d | 32 30 38 33 31 29 29 0a | (#$ . -|20831)).|
|00005200| 23 40 31 35 39 20 2a 43 | 68 61 72 61 63 74 65 72 |#@159 *C|haracter|
|00005210| 73 20 74 68 61 74 20 63 | 6f 6e 73 74 69 74 75 74 |s that c|onstitut|
|00005220| 65 20 77 6f 72 64 73 20 | 6f 66 20 74 79 70 65 20 |e words |of type |
|00005230| 31 2e 0a 4d 6f 72 65 20 | 70 72 65 63 69 73 65 6c |1..More |precisel|
|00005240| 79 2c 20 5b 65 64 69 66 | 66 2d 77 6f 72 64 2d 31 |y, [edif|f-word-1|
|00005250| 5d 20 69 73 20 61 20 72 | 65 67 65 78 70 20 74 68 |] is a r|egexp th|
|00005260| 61 74 20 6d 61 74 63 68 | 65 73 20 74 79 70 65 20 |at match|es type |
|00005270| 31 20 77 6f 72 64 73 2e | 0a 53 65 65 20 60 65 64 |1 words.|.See `ed|
|00005280| 69 66 66 2d 66 6f 72 77 | 61 72 64 2d 77 6f 72 64 |iff-forw|ard-word|
|00005290| 27 20 66 6f 72 20 6d 6f | 72 65 20 64 65 74 61 69 |' for mo|re detai|
|000052a0| 6c 73 2e 1f 0a 28 64 65 | 66 76 61 72 20 65 64 69 |ls...(de|fvar edi|
|000052b0| 66 66 2d 77 6f 72 64 2d | 31 20 22 61 2d 7a 41 2d |ff-word-|1 "a-zA-|
|000052c0| 5a 2d 2d 2d 5f 22 20 28 | 23 24 20 2e 20 2d 32 30 |Z---_" (|#$ . -20|
|000052d0| 39 39 38 29 29 0a 23 40 | 31 35 39 20 2a 43 68 61 |998)).#@|159 *Cha|
|000052e0| 72 61 63 74 65 72 73 20 | 74 68 61 74 20 63 6f 6e |racters |that con|
|000052f0| 73 74 69 74 75 74 65 20 | 77 6f 72 64 73 20 6f 66 |stitute |words of|
|00005300| 20 74 79 70 65 20 32 2e | 0a 4d 6f 72 65 20 70 72 | type 2.|.More pr|
|00005310| 65 63 69 73 65 6c 79 2c | 20 5b 65 64 69 66 66 2d |ecisely,| [ediff-|
|00005320| 77 6f 72 64 2d 32 5d 20 | 69 73 20 61 20 72 65 67 |word-2] |is a reg|
|00005330| 65 78 70 20 74 68 61 74 | 20 6d 61 74 63 68 65 73 |exp that| matches|
|00005340| 20 74 79 70 65 20 32 20 | 77 6f 72 64 73 2e 0a 53 | type 2 |words..S|
|00005350| 65 65 20 60 65 64 69 66 | 66 2d 66 6f 72 77 61 72 |ee `edif|f-forwar|
|00005360| 64 2d 77 6f 72 64 27 20 | 66 6f 72 20 6d 6f 72 65 |d-word' |for more|
|00005370| 20 64 65 74 61 69 6c 73 | 2e 1f 0a 28 64 65 66 76 | details|...(defv|
|00005380| 61 72 20 65 64 69 66 66 | 2d 77 6f 72 64 2d 32 20 |ar ediff|-word-2 |
|00005390| 22 30 2d 39 2e 2c 22 20 | 28 23 24 20 2e 20 2d 32 |"0-9.," |(#$ . -2|
|000053a0| 31 32 31 32 29 29 0a 23 | 40 31 35 39 20 2a 43 68 |1212)).#|@159 *Ch|
|000053b0| 61 72 61 63 74 65 72 73 | 20 74 68 61 74 20 63 6f |aracters| that co|
|000053c0| 6e 73 74 69 74 75 74 65 | 20 77 6f 72 64 73 20 6f |nstitute| words o|
|000053d0| 66 20 74 79 70 65 20 33 | 2e 0a 4d 6f 72 65 20 70 |f type 3|..More p|
|000053e0| 72 65 63 69 73 65 6c 79 | 2c 20 5b 65 64 69 66 66 |recisely|, [ediff|
|000053f0| 2d 77 6f 72 64 2d 33 5d | 20 69 73 20 61 20 72 65 |-word-3]| is a re|
|00005400| 67 65 78 70 20 74 68 61 | 74 20 6d 61 74 63 68 65 |gexp tha|t matche|
|00005410| 73 20 74 79 70 65 20 33 | 20 77 6f 72 64 73 2e 0a |s type 3| words..|
|00005420| 53 65 65 20 60 65 64 69 | 66 66 2d 66 6f 72 77 61 |See `edi|ff-forwa|
|00005430| 72 64 2d 77 6f 72 64 27 | 20 66 6f 72 20 6d 6f 72 |rd-word'| for mor|
|00005440| 65 20 64 65 74 61 69 6c | 73 2e 1f 0a 28 64 65 66 |e detail|s...(def|
|00005450| 76 61 72 20 65 64 69 66 | 66 2d 77 6f 72 64 2d 33 |var edif|f-word-3|
|00005460| 20 22 60 27 3f 21 3a 3b | 5c 22 7b 7d 5b 5d 28 29 | "`'?!:;|\"{}[]()|
|00005470| 22 20 28 23 24 20 2e 20 | 2d 32 31 34 32 31 29 29 |" (#$ . |-21421))|
|00005480| 0a 23 40 31 35 39 20 2a | 43 68 61 72 61 63 74 65 |.#@159 *|Characte|
|00005490| 72 73 20 74 68 61 74 20 | 63 6f 6e 73 74 69 74 75 |rs that |constitu|
|000054a0| 74 65 20 77 6f 72 64 73 | 20 6f 66 20 74 79 70 65 |te words| of type|
|000054b0| 20 34 2e 0a 4d 6f 72 65 | 20 70 72 65 63 69 73 65 | 4..More| precise|
|000054c0| 6c 79 2c 20 5b 65 64 69 | 66 66 2d 77 6f 72 64 2d |ly, [edi|ff-word-|
|000054d0| 34 5d 20 69 73 20 61 20 | 72 65 67 65 78 70 20 74 |4] is a |regexp t|
|000054e0| 68 61 74 20 6d 61 74 63 | 68 65 73 20 74 79 70 65 |hat matc|hes type|
|000054f0| 20 34 20 77 6f 72 64 73 | 2e 0a 53 65 65 20 60 65 | 4 words|..See `e|
|00005500| 64 69 66 66 2d 66 6f 72 | 77 61 72 64 2d 77 6f 72 |diff-for|ward-wor|
|00005510| 64 27 20 66 6f 72 20 6d | 6f 72 65 20 64 65 74 61 |d' for m|ore deta|
|00005520| 69 6c 73 2e 1f 0a 28 64 | 65 66 76 61 72 20 65 64 |ils...(d|efvar ed|
|00005530| 69 66 66 2d 77 6f 72 64 | 2d 34 20 28 63 6f 6e 63 |iff-word|-4 (conc|
|00005540| 61 74 20 22 5e 22 20 65 | 64 69 66 66 2d 77 6f 72 |at "^" e|diff-wor|
|00005550| 64 2d 31 20 65 64 69 66 | 66 2d 77 6f 72 64 2d 32 |d-1 edif|f-word-2|
|00005560| 20 65 64 69 66 66 2d 77 | 6f 72 64 2d 33 20 65 64 | ediff-w|ord-3 ed|
|00005570| 69 66 66 2d 77 68 69 74 | 65 73 70 61 63 65 29 20 |iff-whit|espace) |
|00005580| 28 23 24 20 2e 20 2d 32 | 31 36 33 39 29 29 0a 23 |(#$ . -2|1639)).#|
|00005590| 40 32 36 35 20 4d 6f 76 | 65 20 70 6f 69 6e 74 20 |@265 Mov|e point |
|000055a0| 6f 6e 65 20 77 6f 72 64 | 20 66 6f 72 77 61 72 64 |one word| forward|
|000055b0| 2e 0a 54 68 65 72 65 20 | 61 72 65 20 66 6f 75 72 |..There |are four|
|000055c0| 20 74 79 70 65 73 20 6f | 66 20 77 6f 72 64 73 2c | types o|f words,|
|000055d0| 20 65 61 63 68 20 6f 66 | 20 77 68 69 63 68 20 63 | each of| which c|
|000055e0| 6f 6e 73 69 73 74 73 20 | 65 6e 74 69 72 65 6c 79 |onsists |entirely|
|000055f0| 20 6f 66 0a 63 68 61 72 | 61 63 74 65 72 73 20 69 | of.char|acters i|
|00005600| 6e 20 60 65 64 69 66 66 | 2d 77 6f 72 64 2d 31 27 |n `ediff|-word-1'|
|00005610| 2c 20 60 65 64 69 66 66 | 2d 77 6f 72 64 2d 32 27 |, `ediff|-word-2'|
|00005620| 2c 20 60 65 64 69 66 66 | 2d 77 6f 72 64 2d 33 27 |, `ediff|-word-3'|
|00005630| 2c 20 6f 72 0a 60 65 64 | 69 66 66 2d 77 6f 72 64 |, or.`ed|iff-word|
|00005640| 2d 34 27 2e 20 20 57 6f | 72 64 73 20 61 72 65 20 |-4'. Wo|rds are |
|00005650| 72 65 63 6f 67 6e 69 7a | 65 64 20 62 79 20 70 61 |recogniz|ed by pa|
|00005660| 73 73 69 6e 67 20 74 68 | 65 73 65 20 69 6e 20 74 |ssing th|ese in t|
|00005670| 75 72 6e 20 61 73 20 74 | 68 65 0a 61 72 67 75 6d |urn as t|he.argum|
|00005680| 65 6e 74 20 74 6f 20 60 | 73 6b 69 70 2d 63 68 61 |ent to `|skip-cha|
|00005690| 72 73 2d 66 6f 72 77 61 | 72 64 27 2e 1f 0a 28 64 |rs-forwa|rd'...(d|
|000056a0| 65 66 61 6c 69 61 73 20 | 27 65 64 69 66 66 2d 66 |efalias |'ediff-f|
|000056b0| 6f 72 77 61 72 64 2d 77 | 6f 72 64 20 23 5b 6e 69 |orward-w|ord #[ni|
|000056c0| 6c 20 22 08 c1 77 c2 56 | ae 93 0b c1 77 c2 56 ae |l "..w.V|....w.V.|
|000056d0| 8c 0c c1 77 c2 56 ae 85 | 0d c1 77 c2 56 87 22 20 |...w.V..|..w.V." |
|000056e0| 5b 65 64 69 66 66 2d 77 | 6f 72 64 2d 31 20 6e 69 |[ediff-w|ord-1 ni|
|000056f0| 6c 20 30 20 65 64 69 66 | 66 2d 77 6f 72 64 2d 32 |l 0 edif|f-word-2|
|00005700| 20 65 64 69 66 66 2d 77 | 6f 72 64 2d 33 20 65 64 | ediff-w|ord-3 ed|
|00005710| 69 66 66 2d 77 6f 72 64 | 2d 34 5d 20 32 20 28 23 |iff-word|-4] 2 (#|
|00005720| 24 20 2e 20 32 31 39 30 | 39 29 5d 29 0a 28 64 65 |$ . 2190|9)]).(de|
|00005730| 66 61 6c 69 61 73 20 27 | 65 64 69 66 66 2d 77 6f |falias '|ediff-wo|
|00005740| 72 64 69 66 79 20 23 5b | 28 62 65 67 20 65 6e 64 |rdify #[|(beg end|
|00005750| 20 69 6e 2d 62 75 66 66 | 65 72 20 6f 75 74 2d 62 | in-buff|er out-b|
|00005760| 75 66 66 65 72 20 26 6f | 70 74 69 6f 6e 61 6c 20 |uffer &o|ptional |
|00005770| 63 6f 6e 74 72 6f 6c 2d | 62 75 66 29 20 22 c0 89 |control-|buf) "..|
|00005780| 19 1a 8a 0b 71 88 c4 0d | 0e 06 5c 22 11 0e 07 71 |....q...|..\"...q|
|00005790| 88 c8 20 88 09 63 88 65 | 62 88 0e 09 c0 77 88 65 |.. ..c.e|b....w.e|
|000057a0| 60 7c 88 6d 3f ad c2 0e | 5c 6e ab aa 0e 5c 6e ab |`|.m?...|\n...\n.|
|000057b0| 98 cb 0e 5c 6e 21 ab 92 | cc cb 0e 5c 6e 21 21 ab |...\n!..|...\n!!.|
|000057c0| 8a 72 0e 5c 6e 71 88 0e | 0d 29 aa 8a 0e 0e cf 61 |.r.\nq..|.).....a|
|000057d0| ae 84 d0 0e 11 21 20 88 | aa 84 0e 0d 20 88 60 12 |.....! .|.... .`.|
|000057e0| 0e 09 c0 77 88 5c 6e 60 | 7c 88 d2 63 88 aa 3a 2b |...w.\n`||..c..:+|
|000057f0| 87 22 20 5b 6e 69 6c 20 | 73 74 72 69 6e 67 20 73 |." [nil |string s|
|00005800| 76 2d 70 6f 69 6e 74 20 | 69 6e 2d 62 75 66 66 65 |v-point |in-buffe|
|00005810| 72 20 62 75 66 66 65 72 | 2d 73 75 62 73 74 72 69 |r buffer|-substri|
|00005820| 6e 67 2d 6e 6f 2d 70 72 | 6f 70 65 72 74 69 65 73 |ng-no-pr|operties|
|00005830| 20 62 65 67 20 65 6e 64 | 20 6f 75 74 2d 62 75 66 | beg end| out-buf|
|00005840| 66 65 72 20 65 72 61 73 | 65 2d 62 75 66 66 65 72 |fer eras|e-buffer|
|00005850| 20 65 64 69 66 66 2d 77 | 68 69 74 65 73 70 61 63 | ediff-w|hitespac|
|00005860| 65 20 63 6f 6e 74 72 6f | 6c 2d 62 75 66 20 67 65 |e contro|l-buf ge|
|00005870| 74 2d 62 75 66 66 65 72 | 20 62 75 66 66 65 72 2d |t-buffer| buffer-|
|00005880| 6e 61 6d 65 20 65 64 69 | 66 66 2d 66 6f 72 77 61 |name edi|ff-forwa|
|00005890| 72 64 2d 77 6f 72 64 2d | 66 75 6e 63 74 69 6f 6e |rd-word-|function|
|000058a0| 20 74 68 69 73 2d 63 6f | 6d 6d 61 6e 64 20 65 64 | this-co|mmand ed|
|000058b0| 69 66 66 2d 71 75 69 74 | 20 65 72 72 6f 72 20 65 |iff-quit| error e|
|000058c0| 64 69 66 66 2d 4b 49 4c | 4c 45 44 2d 56 49 54 41 |diff-KIL|LED-VITA|
|000058d0| 4c 2d 42 55 46 46 45 52 | 20 22 5c 6e 22 5d 20 33 |L-BUFFER| "\n"] 3|
|000058e0| 5d 29 0a 28 64 65 66 61 | 6c 69 61 73 20 27 65 64 |]).(defa|lias 'ed|
|000058f0| 69 66 66 2d 63 6f 70 79 | 2d 74 6f 2d 62 75 66 66 |iff-copy|-to-buff|
|00005900| 65 72 20 23 5b 28 62 65 | 67 20 65 6e 64 20 69 6e |er #[(be|g end in|
|00005910| 2d 62 75 66 66 65 72 20 | 6f 75 74 2d 62 75 66 66 |-buffer |out-buff|
|00005920| 65 72 29 20 22 c0 19 8a | 5c 6e 71 88 0b 0c 7b 11 |er) "...|\nq...{.|
|00005930| 0d 71 88 c6 20 88 09 63 | 88 65 62 2a 87 22 20 5b |.q.. ..c|.eb*." [|
|00005940| 6e 69 6c 20 73 74 72 69 | 6e 67 20 69 6e 2d 62 75 |nil stri|ng in-bu|
|00005950| 66 66 65 72 20 62 65 67 | 20 65 6e 64 20 6f 75 74 |ffer beg| end out|
|00005960| 2d 62 75 66 66 65 72 20 | 65 72 61 73 65 2d 62 75 |-buffer |erase-bu|
|00005970| 66 66 65 72 5d 20 32 5d | 29 0a 28 64 65 66 61 6c |ffer] 2]|).(defal|
|00005980| 69 61 73 20 27 65 64 69 | 66 66 2d 67 6f 74 6f 2d |ias 'edi|ff-goto-|
|00005990| 77 6f 72 64 20 23 5b 28 | 6e 20 62 75 66 20 26 6f |word #[(|n buf &o|
|000059a0| 70 74 69 6f 6e 61 6c 20 | 66 6c 61 67 29 20 22 08 |ptional |flag) ".|
|000059b0| 19 5c 6e ab ba c3 5c 6e | 21 ab b5 c4 c3 5c 6e 21 |.\n...\n|!....\n!|
|000059c0| 21 ab ae 72 5c 6e 71 88 | 0d c6 77 88 0e 07 c8 56 |!..r\nq.|..w....V|
|000059d0| ab 8f 09 20 88 0d c6 77 | 88 0e 07 53 89 16 07 aa |... ...w|...S....|
|000059e0| 6d 0e 09 ab 89 0e 07 ca | 56 ab 83 09 20 88 60 29 |m.......|V... .`)|
|000059f0| aa 8a 0e 0b cc 61 ae 84 | cd 0e 0e 21 29 87 22 20 |.....a..|...!)." |
|00005a00| 5b 65 64 69 66 66 2d 66 | 6f 72 77 61 72 64 2d 77 |[ediff-f|orward-w|
|00005a10| 6f 72 64 2d 66 75 6e 63 | 74 69 6f 6e 20 66 77 64 |ord-func|tion fwd|
|00005a20| 2d 77 6f 72 64 2d 66 75 | 6e 20 62 75 66 20 67 65 |-word-fu|n buf ge|
|00005a30| 74 2d 62 75 66 66 65 72 | 20 62 75 66 66 65 72 2d |t-buffer| buffer-|
|00005a40| 6e 61 6d 65 20 65 64 69 | 66 66 2d 77 68 69 74 65 |name edi|ff-white|
|00005a50| 73 70 61 63 65 20 6e 69 | 6c 20 6e 20 31 20 66 6c |space ni|l n 1 fl|
|00005a60| 61 67 20 30 20 74 68 69 | 73 2d 63 6f 6d 6d 61 6e |ag 0 thi|s-comman|
|00005a70| 64 20 65 64 69 66 66 2d | 71 75 69 74 20 65 72 72 |d ediff-|quit err|
|00005a80| 6f 72 20 65 64 69 66 66 | 2d 4b 49 4c 4c 45 44 2d |or ediff|-KILLED-|
|00005a90| 56 49 54 41 4c 2d 42 55 | 46 46 45 52 5d 20 34 5d |VITAL-BU|FFER] 4]|
|00005aa0| 29 0a 23 40 34 31 20 54 | 20 69 66 20 46 31 20 61 |).#@41 T| if F1 a|
|00005ab0| 6e 64 20 46 32 20 68 61 | 76 65 20 69 64 65 6e 74 |nd F2 ha|ve ident|
|00005ac0| 69 63 61 6c 20 63 6f 6e | 74 65 6e 74 73 2e 1f 0a |ical con|tents...|
|00005ad0| 28 64 65 66 61 6c 69 61 | 73 20 27 65 64 69 66 66 |(defalia|s 'ediff|
|00005ae0| 2d 73 61 6d 65 2d 66 69 | 6c 65 2d 63 6f 6e 74 65 |-same-fi|le-conte|
|00005af0| 6e 74 73 20 23 5b 28 66 | 31 20 66 32 29 20 22 c0 |nts #[(f|1 f2) ".|
|00005b00| 09 c2 89 89 0b 0c 26 06 | 89 1d a7 ad 83 0d c6 61 |......&.|.......a|
|00005b10| 29 87 22 20 5b 63 61 6c | 6c 2d 70 72 6f 63 65 73 |)." [cal|l-proces|
|00005b20| 73 20 65 64 69 66 66 2d | 63 6d 70 2d 70 72 6f 67 |s ediff-|cmp-prog|
|00005b30| 72 61 6d 20 6e 69 6c 20 | 66 31 20 66 32 20 72 65 |ram nil |f1 f2 re|
|00005b40| 73 20 30 5d 20 38 20 28 | 23 24 20 2e 20 32 33 32 |s 0] 8 (|#$ . 232|
|00005b50| 30 37 29 5d 29 0a | |07)]). | |
+--------+-------------------------+-------------------------+--------+--------+
